Skip to content

Commit af87571

Browse files
authored
Merge pull request #69 from crazy-max/rm-sign-matrix
remove sign attribute from matrix
2 parents 0148b58 + b00a98f commit af87571

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

.github/workflows/bake.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,14 @@ jobs:
252252
if (platforms.length === 0) {
253253
includes.push({
254254
index: 0,
255-
runner: runner === 'auto' ? 'ubuntu-24.04' : runner,
256-
sign: sign
255+
runner: runner === 'auto' ? 'ubuntu-24.04' : runner
257256
});
258257
} else {
259258
platforms.forEach((platform, index) => {
260259
includes.push({
261260
index: index,
262261
platform: platform,
263-
runner: runner === 'auto' ? ((!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04') : runner,
264-
sign: sign
262+
runner: runner === 'auto' ? ((!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04') : runner
265263
});
266264
});
267265
}
@@ -509,7 +507,7 @@ jobs:
509507
core.setOutput('digest', imageDigest);
510508
-
511509
name: Install Cosign
512-
if: ${{ needs.prepare.outputs.sign }}
510+
if: ${{ needs.prepare.outputs.sign == 'true' }}
513511
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
514512
env:
515513
INPUT_COSIGN-VERSION: ${{ env.COSIGN_VERSION }}
@@ -532,7 +530,7 @@ jobs:
532530
-
533531
name: Signing attestation manifests
534532
id: signing-attestation-manifests
535-
if: ${{ matrix.sign && inputs.output == 'image' }}
533+
if: ${{ needs.prepare.outputs.sign == 'true' && inputs.output == 'image' }}
536534
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
537535
env:
538536
INPUT_IMAGE-NAMES: ${{ inputs.meta-images }}
@@ -579,7 +577,7 @@ jobs:
579577
-
580578
name: Signing local artifacts
581579
id: signing-local-artifacts
582-
if: ${{ matrix.sign && inputs.output == 'local' }}
580+
if: ${{ needs.prepare.outputs.sign == 'true' && inputs.output == 'local' }}
583581
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
584582
env:
585583
INPUT_LOCAL-OUTPUT-DIR: ${{ env.LOCAL_EXPORT_DIR }}
@@ -631,7 +629,7 @@ jobs:
631629
INPUT_IMAGE-DIGEST: ${{ steps.get-image-digest.outputs.digest }}
632630
INPUT_ARTIFACT-NAME: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
633631
INPUT_ARTIFACT-UPLOAD: ${{ inputs.artifact-upload }}
634-
INPUT_SIGNED: ${{ matrix.sign }}
632+
INPUT_SIGNED: ${{ needs.prepare.outputs.sign }}
635633
with:
636634
script: |
637635
const inpIndex = core.getInput('index');

.github/workflows/build.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,14 @@ jobs:
214214
if (inpPlatforms.length === 0) {
215215
includes.push({
216216
index: 0,
217-
runner: runner === 'auto' ? 'ubuntu-24.04' : runner,
218-
sign: sign
217+
runner: runner === 'auto' ? 'ubuntu-24.04' : runner
219218
});
220219
} else {
221220
inpPlatforms.forEach((platform, index) => {
222221
includes.push({
223222
index: index,
224223
platform: platform,
225-
runner: runner === 'auto' ? ((!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04') : runner,
226-
sign: sign
224+
runner: runner === 'auto' ? ((!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04') : runner
227225
});
228226
});
229227
}
@@ -410,7 +408,7 @@ jobs:
410408
GIT_AUTH_TOKEN: ${{ secrets.github-token || github.token }}
411409
-
412410
name: Install Cosign
413-
if: ${{ needs.prepare.outputs.sign }}
411+
if: ${{ needs.prepare.outputs.sign == 'true' }}
414412
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
415413
env:
416414
INPUT_COSIGN-VERSION: ${{ env.COSIGN_VERSION }}
@@ -433,7 +431,7 @@ jobs:
433431
-
434432
name: Signing attestation manifests
435433
id: signing-attestation-manifests
436-
if: ${{ matrix.sign && inputs.output == 'image' }}
434+
if: ${{ needs.prepare.outputs.sign == 'true' && inputs.output == 'image' }}
437435
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
438436
env:
439437
INPUT_IMAGE-NAMES: ${{ inputs.meta-images }}
@@ -480,7 +478,7 @@ jobs:
480478
-
481479
name: Signing local artifacts
482480
id: signing-local-artifacts
483-
if: ${{ matrix.sign && inputs.output == 'local' }}
481+
if: ${{ needs.prepare.outputs.sign == 'true' && inputs.output == 'local' }}
484482
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
485483
env:
486484
INPUT_LOCAL-OUTPUT-DIR: ${{ env.LOCAL_EXPORT_DIR }}
@@ -532,7 +530,7 @@ jobs:
532530
INPUT_IMAGE-DIGEST: ${{ steps.build.outputs.digest }}
533531
INPUT_ARTIFACT-NAME: ${{ inputs.artifact-name }}${{ steps.prepare.outputs.platform-pair-suffix }}
534532
INPUT_ARTIFACT-UPLOAD: ${{ inputs.artifact-upload }}
535-
INPUT_SIGNED: ${{ matrix.sign }}
533+
INPUT_SIGNED: ${{ needs.prepare.outputs.sign }}
536534
with:
537535
script: |
538536
const inpIndex = core.getInput('index');

0 commit comments

Comments
 (0)