Skip to content

Commit

Permalink
Inline the workflow that generate sbom into the general release tasks (
Browse files Browse the repository at this point in the history
…#455)

Signed-off-by: Jose R. Gonzalez <[email protected]>
  • Loading branch information
komish committed Jul 10, 2024
1 parent 48622f3 commit a0b0d3e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 28 deletions.
22 changes: 21 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@ jobs:
echo "Binary version ($bin_version) doesn't match tag ($release_version)" && exit 1
fi
- name: Generate SBOM filename
id: generate_sbom_filename
run: echo sbom_filename="${{ github.event.repository.name }}-${{ steps.get_tag.outputs.release_version }}-sbom.spdx.json" | tee -a $GITHUB_OUTPUT

- name: Generate SBOM
continue-on-error: true
id: generate_sbom
uses: anchore/sbom-action@v0
with:
# Setting path to null works around this bug:
# https://github.com/anchore/sbom-action/issues/389
path: null
file: go.mod
format: spdx-json
output-file: ${{ steps.generate_sbom_filename.outputs.sbom_filename }}
artifact-name: ${{ steps.generate_sbom_filename.outputs.sbom_filename }}
upload-release-assets: false

- name: Set up Python 3.x
uses: ./.github/actions/setup-python

Expand All @@ -83,7 +101,9 @@ jobs:
with:
tag_name: ${{ steps.get_tag.outputs.release_version }}
body: ${{ steps.release_body.outputs.release_body }}
files: ${{ steps.build_bin.outputs.tarball_path }}
files: |
${{ steps.build_bin.outputs.tarball_path }}
${{ steps.generate_sbom_filename.outputs.sbom_filename }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/sbom-on-release.yaml

This file was deleted.

0 comments on commit a0b0d3e

Please sign in to comment.