@@ -347,19 +347,20 @@ jobs:
347347 sarif_file : ${{ env.DESTDIR }}/govulncheck.out
348348
349349 binaries :
350- uses : docker/github-builder-experimental/.github/workflows/bake.yml@8fc70909404a502fd0eca6601b99b32fa7192b03
350+ uses : docker/github-builder-experimental/.github/workflows/bake.yml@5876e8deef3c899c298ec80b07c43dd9e89d37f6
351351 permissions :
352352 contents : read # same as global permission
353353 id-token : write # for signing attestation(s) with GitHub OIDC Token
354354 with :
355355 runner : amd64
356- target : release
357- output : local
358- push : ${{ github.event_name != 'pull_request' }}
359356 artifact-name : buildx
357+ artifact-upload : true
360358 cache : true
361- cache-scope : binaries
362- bake-sbom : true
359+ cache-scope : bin-image
360+ target : release
361+ output : local
362+ sbom : true
363+ sign : ${{ github.event_name != 'pull_request' }}
363364
364365 binaries-finalize :
365366 runs-on : ubuntu-24.04
@@ -371,8 +372,7 @@ jobs:
371372 uses : actions/download-artifact@v6
372373 with :
373374 path : /tmp/buildx-output
374- pattern : ${{ needs.binaries.outputs.artifact-name }}*
375- merge-multiple : true
375+ name : ${{ needs.binaries.outputs.artifact-name }}
376376 -
377377 name : Rename provenance and sbom
378378 run : |
@@ -385,7 +385,7 @@ jobs:
385385 mv "sbom-binaries.spdx.json" "${filename}.sbom.json"
386386 find . -name 'sbom*.json' -exec rm {} \;
387387 if [ -f "provenance.sigstore.json" ]; then
388- mv "provenance.sigstore.json" "${filename}.provenance. sigstore.json"
388+ mv "provenance.sigstore.json" "${filename}.sigstore.json"
389389 fi
390390 )
391391 done
@@ -426,7 +426,7 @@ jobs:
426426
427427 bin-image :
428428 if : ${{ github.repository == 'docker/buildx' }}
429- uses : docker/github-builder-experimental/.github/workflows/bake.yml@8fc70909404a502fd0eca6601b99b32fa7192b03
429+ uses : docker/github-builder-experimental/.github/workflows/bake.yml@5876e8deef3c899c298ec80b07c43dd9e89d37f6
430430 needs :
431431 - bin-image-prepare
432432 - test-integration
@@ -437,10 +437,11 @@ jobs:
437437 with :
438438 runner : amd64
439439 target : image-cross
440- output : image
441- push : ${{ github.event_name != 'pull_request' }}
442440 cache : true
443441 cache-scope : bin-image
442+ output : image
443+ push : ${{ github.event_name != 'pull_request' }}
444+ sbom : true
444445 set-meta-labels : true
445446 meta-images : |
446447 ${{ needs.bin-image-prepare.outputs.repo-slug }}
@@ -449,7 +450,6 @@ jobs:
449450 type=ref,event=pr
450451 type=semver,pattern={{version}}
451452 meta-bake-target : meta-helper
452- bake-sbom : true
453453 secrets :
454454 registry-auths : |
455455 - registry: docker.io
0 commit comments