Skip to content

Commit

Permalink
Bring back correct merging of sbom in deptrack test action
Browse files Browse the repository at this point in the history
  • Loading branch information
RandomTannenbaum committed Jan 29, 2025
1 parent 87f8540 commit 068d204
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/deptrack-test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: 'Merge frontend and backend SBOMs'
run: |
docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --input-files data/backend/target/bom.xml data/sbom-npm.json --output-file data/sbom.xml
docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli merge --hierarchical --name OKR --version ${{ env.VERSION }} --input-files data/backend/target/bom.xml data/sbom-npm.json --output-file data/sbom.xml
- name: 'Validate SBOM'
run: docker run --rm -v $(pwd):/data cyclonedx/cyclonedx-cli validate --input-format xml --input-version v1_6 --input-file data/sbom.xml --fail-on-errors
Expand Down

0 comments on commit 068d204

Please sign in to comment.