Skip to content

Commit

Permalink
Fixes workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
vpetersson committed Aug 15, 2024
1 parent 3d429d9 commit f969e17
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/phase_1_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on: [push]

env:
TRIVY_VERSION: 0.54.1
SBOMASM_VERSION: 0.1.4

jobs:
Container:
Expand Down Expand Up @@ -103,6 +104,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install sbomasm
run: |
curl -L -o /tmp/sbomasm \
"https://github.com/interlynk-io/sbomasm/releases/download/v${SBOMASM_VERSION}/sbomasm-linux-amd64"
chmod +x /tmp/sbomasm
# Should probably pin this dependency
- name: "Install sbommerge"
run: |
Expand All @@ -111,11 +118,9 @@ jobs:
- name: Download all workflow run artifacts
uses: actions/download-artifact@v4

- name: "Debug: SBOMs"
run: |
find . -iname *.json
# We need `continue-on-error: true` here as we sometimes get a non-exit 0
- name: "CycloneDX: Generate Merged SBOM"
continue-on-error: true
run: |
sbommerge \
--format json \
Expand Down

0 comments on commit f969e17

Please sign in to comment.