Merge pull request #162 from viccuad/main

ci: Fix artifact upload and download
kubewarden · Dec 19, 2023 · 6082d7f · 6082d7f
2 parents 89a47e7 + ddddafa
commit 6082d7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,15 +92,19 @@ jobs:
             }
             core.setFailed(`Draft release not found`)
 
-      - name: Download SBOM artifact
-        uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
+      - name: Download SBOM artifacts
+        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: sbom
+          pattern: sbom-*
+          path: ./
+          merge-multiple: true
 
-      - name: Download CRDs artifact
-        uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
+      - name: Download CRDs artifacts
+        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: CRDS
+          pattern: CRDS
+          path: ./
+          merge-multiple: true
 
       - name: Display structure of downloaded files
         run: ls -R

diff --git a/.github/workflows/sbom.yml b/.github/workflows/sbom.yml
@@ -79,5 +79,5 @@ jobs:
       - name: Upload SBOMs as artifacts
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
-          name: sbom
+          name: sbom-${{ matrix.arch }}
           path: audit-scanner-sbom-${{ matrix.arch }}*