workaround container names

Smoke-Cloud · Dec 26, 2024 · eec74f8 · eec74f8
1 parent a96a51d
commit eec74f8
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/.github/workflows/smv.yml b/.github/workflows/smv.yml
@@ -38,10 +38,14 @@ jobs:
         run: |
           cd smv
           bash ./buildrpm.sh
-          ls ../dist/*.rpm
+          ls ../dist/*.rp
+      - id: setContainerSafeName
+        run: |
+          export test_version=$(echo ${{ matrix.container }} |  sed 's/:/\-/g')
+          echo ::set-output name=containerSafe::$test_version
       - uses: actions/upload-artifact@v4
         with:
-          name: SMV-RPMs-${{ matrix.container }}
+          name: SMV-RPMs-${{ steps.setContainerSafeName.outputs.containerSafe }}
           path: |
             dist/*.rpm
   build_windows_msvc:
@@ -103,3 +107,12 @@ jobs:
         with:
           name: SMV-MSIs
           path: smv/build/SMVLuaInstaller.msi
+  merge:
+    runs-on: ubuntu-latest
+    needs: build-rpm
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: SMV-RPMs
+          pattern: SMV-RPMs-*