Merge branch 'main' into feature/add-non-root-user

philips-software · Dec 5, 2023 · 6c90e08 · 6c90e08
2 parents 902db74 + 491e9f9
commit 6c90e08
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f
+FROM ubuntu:22.04@sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb
 
 ARG USERNAME=amp
 ARG USER_UID=1000

diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt
@@ -1,2 +1,2 @@
-cmake==3.27.7
+cmake==3.27.9
 gcovr==6.0
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -31,8 +31,10 @@ jobs:
     steps:
       - uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 # v3.2.0
         if: ${{ github.event_name != 'merge_group' }}
-      - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+      - uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3 # v5.2.0
         id: meta
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}
           # Generate Docker tags based on the following events/attributes
@@ -43,13 +45,10 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-      - run: |
-          set -Eeuo pipefail
-          ANNOTATIONS=$(echo '${{ steps.meta.outputs.labels }}' | sed 's/org.opencontainers.image./annotation-index.org.opencontainers.image./' | tr '\n' ',')
-          echo "annotations=${ANNOTATIONS::-1}" >> "$GITHUB_OUTPUT"
-        id: annotations
       - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
       - uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        with:
+          version: v0.12.0
       - uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         if: ${{ github.event_name != 'merge_group' }}
         with:
@@ -64,7 +63,7 @@ jobs:
           push: ${{ github.event_name != 'merge_group' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,${{ steps.annotations.outputs.annotations }}
+          annotations: ${{ steps.meta.outputs.annotations }}
           sbom: true
           provenance: true
           cache-from: type=gha

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -16,7 +16,7 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@db8f2c60ee802b3748b512940dde88eabd7b7e01 # v3.7.13
+      - uses: google-github-actions/release-please-action@a6d1fd9854c8c40688a72f7e4b072a1e965860a0 # v4.0.0
         with:
           command: manifest
           token: ${{ secrets.AMP_RELEASER_TOKEN }}
diff --git a/.github/workflows/social-interaction.yml b/.github/workflows/social-interaction.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
-      - uses: actions/first-interaction@1dbfe1ba5525b8257e1f259b09745bee346d62d8 # v1.2.0
+      - uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7 # v1.3.0
         continue-on-error: true
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}