feature/143-aai-eft Generate and merge SBOMs (squash later)

puzzle · Oct 24, 2024 · 4f8261c · 4f8261c
1 parent ed4ae87
commit 4f8261c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/.github/workflows/release-docker-image.yml b/.github/workflows/release-docker-image.yml
@@ -132,14 +132,13 @@ jobs:
           tag: v0.27.1
           name: cyclonedx-linux-x64
 
-      - name: Convert SBOMs to correct format
-        run: cyclonedx convert --input-file application-image.spdx.json  --output-file application-image.xml --output-format xml
-
-
       - name: Convert SBOMs to correct format
         run: |
+          cyclonedx convert --input-file application-image.spdx.json  --output-file application-image.xml --output-format xml
           cyclonedx convert --input-file shibboleth-image.spdx.json  --output-file shibboleth-image.xml --output-format xml
-          cyclonedx-cli merge --input-file shibboleth-image.xml application-image.xml target/bom.xml --output-file sbom.xml
+
+      - name: Merge SBOMs
+        run: cyclonedx merge --input-file application-image.xml application-image.xml target/bom.xml --output-file sbom.xml
 
 #      - name: Push application SBOM to dependency track
 #        env: