Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ jobs:
with:
output: local
push: ${{ github.event_name != 'pull_request' }}
artifact-name: build-output-single
artifact-name: build-single-output
build-file: test/hello.Dockerfile
build-sbom: true

Expand Down Expand Up @@ -564,7 +564,7 @@ jobs:
output: local
push: ${{ github.event_name != 'pull_request' }}
cache: true
artifact-name: bake-output-single
artifact-name: bake-single-output
bake-sbom: true

bake-local-single-verify:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/bake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ jobs:
if: ${{ inputs.output == 'local' }}
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix || '0' }}
path: ${{ env.LOCAL_EXPORT_DIR }}
if-no-files-found: error
-
Expand Down Expand Up @@ -746,6 +746,14 @@ jobs:
});
}
}
-
name: Merge artifacts
if: ${{ inputs.output == 'local' }}
uses: actions/upload-artifact/merge@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: ${{ inputs.artifact-name }}
pattern: ${{ inputs.artifact-name }}*
delete-merged: true
-
name: Set outputs
id: set
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ jobs:
if: ${{ inputs.output == 'local' }}
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
name: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix || '0' }}
path: ${{ env.LOCAL_EXPORT_DIR }}
if-no-files-found: error
-
Expand Down Expand Up @@ -639,6 +639,14 @@ jobs:
});
}
}
-
name: Merge artifacts
if: ${{ inputs.output == 'local' }}
uses: actions/upload-artifact/merge@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: ${{ inputs.artifact-name }}
pattern: ${{ inputs.artifact-name }}*
delete-merged: true
-
name: Set outputs
id: set
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@ jobs:
with:
registry-auth: ${{ secrets.registry-auths }}
-
name: Download artifact
name: Download artifacts
if: ${{ steps.vars.outputs.output-type == 'local' }}
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
with:
pattern: ${{ steps.vars.outputs.artifact-name }}*
merge-multiple: true
name: ${{ steps.vars.outputs.artifact-name }}
-
name: Verify signatures
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
Expand Down
Loading