From eec74f8419470ff818f2cbbefa2743ff37572c9f Mon Sep 17 00:00:00 2001 From: Jake O'Shannessy Date: Thu, 26 Dec 2024 20:01:59 +0000 Subject: [PATCH] workaround container names --- .github/workflows/smv.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/smv.yml b/.github/workflows/smv.yml index f7a5b62..9a8f465 100644 --- 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-*