Skip to content

Commit 7915841

Browse files
askptbeeme1mr
andauthored
ci: Fix SBOM path (#408)
Signed-off-by: André Silva <[email protected]> Co-authored-by: Michael Beemer <[email protected]>
1 parent b2c5204 commit 7915841

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
with:
2020
token: ${{secrets.RELEASE_PLEASE_ACTION_TOKEN}}
2121
outputs:
22-
release_created: ${{ fromJSON(steps.release.outputs.paths_released)[0] != null }} # if we have a single release path, do the release
23-
# release_tag_name: ${{ steps.release.outputs.release_tag_name }}
22+
all: ${{ toJSON(steps.release.outputs) }}
23+
releases_created: ${{ steps.release.outputs.releases_created }}
2424
paths_released: ${{ steps.release.outputs.paths_released }}
2525

2626
release:
@@ -32,10 +32,12 @@ jobs:
3232
contents: write # upload sbom to a release
3333
attestations: write
3434
packages: read # for internal nuget reading
35-
if: ${{ needs.release-package.outputs.release_created }}
35+
if: ${{ fromJSON(needs.release-package.outputs.releases_created || false) }}
3636
strategy:
3737
matrix:
3838
release: ${{ fromJSON(needs.release-package.outputs.paths_released) }}
39+
env:
40+
TAG_NAME: ${{ fromJSON(needs.release-package.outputs.all)[format('{0}--tag_name', matrix.release)] }}
3941

4042
steps:
4143
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -90,9 +92,7 @@ jobs:
9092
subject-path: "${{ matrix.release }}/**/*.nupkg"
9193
sbom-path: bom.json
9294

93-
# TODO: We need to look into this link and fix the tag_name https://github.com/googleapis/release-please-action?tab=readme-ov-file#outputs
94-
# Because we are using a multiple release path, we need to use the <path>--tag_name from the release-package job
95-
# - name: Attach SBOM to artifact
96-
# env:
97-
# GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
98-
# run: gh release upload ${{ needs.release-package.outputs.release_tag_name }} bom.json
95+
- name: Attach SBOM to artifact
96+
env:
97+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
98+
run: gh release upload ${{ env.TAG_NAME }} bom.json

0 commit comments

Comments
 (0)