Fix scan report filename to match the built artifact

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Nov 8, 2023 · 8abcd71 · 8abcd71
1 parent e5a096d
commit 8abcd71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
@@ -131,7 +131,8 @@ jobs:
         run: |
           export VERSION=$(cat build/VERSION)
           cd build
-          sudo tar cvf "kairos-core-${{matrix.flavor}}-arm64-${{matrix.model}}-${VERSION}-scan-reports.tar.gz" *.json
+          filename=$(ls *-grype.json | head -n 1) && filename=${filename%%-grype.json}
+          sudo tar cvf "${filename}-scan-reports.tar.gz" *.json
       - name: Push  🔧
         if: startsWith(github.ref, 'refs/tags/')
         run: |
@@ -254,7 +255,8 @@ jobs:
         run: |
           export VERSION=$(cat build/VERSION)
           cd build
-          sudo tar cvf "kairos-standard-${{matrix.flavor}}-arm64-${{matrix.model}}-${VERSION}-scan-reports.tar.gz" *.json
+          filename=$(ls *-grype.json | head -n 1) && filename=${filename%%-grype.json}
+          sudo tar cvf "${filename}-scan-reports.tar.gz" *.json
       - name: Push  🔧
         if: startsWith(github.ref, 'refs/tags/')
         run: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -201,7 +201,8 @@ jobs:
           mkdir reports
           mv release/*.json reports/
           cd reports
-          sudo tar cvf "kairos-core-${{matrix.flavor}}-amd64-generic-${VERSION}-scan-reports.tar.gz" *.json
+          filename=$(ls *-grype.json | head -n 1) && filename=${filename%%-grype.json}
+          sudo tar cvf "${filename}-scan-reports.tar.gz" *.json
           mv *.tar.gz ../release/
           cd ..
           rm release/VERSION release/IMAGE release/versions.yaml