Skip to content

Commit 8a7e611

Browse files
authored
Merge pull request #132 from smlx/remove-custom-sbom
remove custom sbom
2 parents 2049e92 + f0cf0ab commit 8a7e611

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/release.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ jobs:
6464
- name: Set up environment
6565
run: echo "GOVERSION=$(go version)" >> "$GITHUB_ENV"
6666
- uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
67-
- uses: anchore/sbom-action/download-syft@9fece9e20048ca9590af301449208b2b8861333b # v0.15.9
67+
- uses: advanced-security/sbom-generator-action@375dee8e6144d9fd0ec1f5667b4f6fb4faacefed # v0.0.1
68+
id: sbom
6869
- uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
6970
with:
7071
version: latest
7172
args: release --clean
7273
env:
7374
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
GITHUB_SBOM_PATH: ${{ steps.sbom.outputs.fileName }}

.goreleaser.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ builds:
2222
changelog:
2323
use: github-native
2424

25-
sboms:
26-
- artifacts: archive
27-
2825
signs:
2926
- cmd: cosign
3027
signature: "${artifact}.sig"
@@ -73,3 +70,8 @@ docker_signs:
7370
- "--yes"
7471
artifacts: all
7572
output: true
73+
74+
release:
75+
extra_files:
76+
- glob: "{{ .Env.GITHUB_SBOM_PATH }}"
77+
name_template: "./go-cli-github.v{{ .Version }}.sbom.spdx.json"

0 commit comments

Comments
 (0)