Skip to content

Commit 5a31af8

Browse files
Copilotpvliesdonk
andcommitted
fix: correct release workflow dependencies and SBOM artifact handling
- Add build-image as dependency to generate-sbom job (needs image digest) - Add build-image as dependency to deploy-docs job (references build-image outputs) - Add build-distributions as dependency to publish-release-assets (needs dist artifacts) - Make SBOM artifact download conditional in publish-release-assets (only when generate-sbom succeeded) This fixes the workflow failure on push to next where SBOM generation is skipped for prereleases but publish-release-assets tries to download non-existent SBOM artifacts. Co-authored-by: pvliesdonk <22190282+pvliesdonk@users.noreply.github.com>
1 parent c8d3032 commit 5a31af8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,11 +453,12 @@ jobs:
453453

454454
generate-sbom:
455455
name: Generate SBOM
456-
needs: release
456+
needs: [release, build-image]
457457
# Only generate SBOM for stable releases, not pre-releases
458458
if: |
459459
always() &&
460460
needs.release.result == 'success' &&
461+
needs.build-image.result == 'success' &&
461462
needs.release.outputs.new_tag != '' &&
462463
needs.release.outputs.is_prerelease == 'false'
463464
runs-on: ubuntu-latest
@@ -500,11 +501,12 @@ jobs:
500501

501502
publish-release-assets:
502503
name: Publish Release Assets (GitHub Release only)
503-
needs: [release, build-image, generate-sbom]
504+
needs: [release, build-image, build-distributions, generate-sbom]
504505
if: |
505506
always() &&
506507
needs.release.result == 'success' &&
507508
needs.build-image.result == 'success' &&
509+
needs.build-distributions.result == 'success' &&
508510
(needs.generate-sbom.result == 'success' || needs.generate-sbom.result == 'skipped') &&
509511
needs.release.outputs.released == 'true' &&
510512
needs.release.outputs.new_tag != ''
@@ -527,6 +529,7 @@ jobs:
527529
path: ./artifacts/e2e
528530

529531
- name: Download SBOM artifacts
532+
if: needs.generate-sbom.result == 'success'
530533
uses: actions/download-artifact@v4
531534
with:
532535
name: sbom-reports
@@ -596,11 +599,12 @@ jobs:
596599
597600
deploy-docs:
598601
name: Deploy Documentation (Pages)
599-
needs: release
602+
needs: [release, build-image]
600603
# Only deploy docs for stable releases, not pre-releases
601604
if: |
602605
always() &&
603606
needs.release.result == 'success' &&
607+
needs.build-image.result == 'success' &&
604608
needs.release.outputs.new_tag != '' &&
605609
needs.release.outputs.is_prerelease == 'false'
606610
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)