cylclonedx

hrzlgnm · Sep 28, 2024 · d54ec0e · d54ec0e
1 parent 5728d53
commit d54ec0e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.github/workflows/tauri-pr-build.yml b/.github/workflows/tauri-pr-build.yml
@@ -92,15 +92,22 @@ jobs:
       - name: Build using tauri action
         uses: tauri-apps/tauri-action@v0.5.14
       - name: cached install cargo-sbom
+      - name: Cached install cargo-cyclonedx
         uses: taiki-e/cache-cargo-install-action@v2.0.1
         with:
-          tool: cargo-sbom
+          tool: cargo-cyclonedx
+
+      - name: Install cycloned-cli
+        uses: robinraju/release-downloader@v1
+        with:
+          repository: CycloneDX/cyclonedx-cli
+          latest: true
 
       - name: Generate SBOM
         run: |
           mkdir -p sbom
-          cargo sbom --output-format=spdx_json_2_3 > sbom/spdx_json_2_3-${{matrix.platform}}.json
-          cargo sbom --output-format=cyclone_dx_json_1_4 > sbom/cyclone_dx_json_1_4-${{matrix.platform}}.json
+          cargo cyclonedx --all --format json --output-cdx
+          cyclonedx merge --input-files *.json --output-file sbom/mdns-browser-${{matrix.platform}}.cdx.json
 
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v3.1.0