diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67531ae..2f1c100 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,17 +20,13 @@ jobs: - name: Download SummerCart64 repository uses: actions/checkout@v3 - - uses: bluwy/substitute-string-action@v2.0.1 + - name: Set SC64 version + uses: frabert/replace-string-action@v2 id: sc64version with: - _input-text: ${{ github.ref_name }} - [\]: - - - # - name: Set SC64 version - # run: | - # echo "$GITHUB_REF_NAME" - # SC64_VERSION=-${GITHUB_REF_NAME//\//-} - # echo "$SC64_VERSION" + pattern: '\/' + string: ${{ github.ref_name }} + replace-with: '-' - name: Build everything run: ./docker_build.sh release --force-clean @@ -38,18 +34,18 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: sc64-pkg${{ steps.sc64version.outputs.result }} + name: sc64-pkg${{ steps.sc64version.outputs.replaced }} path: | - sc64-extra${{ steps.sc64version.outputs.result }}.zip - sc64-firmware${{ steps.sc64version.outputs.result }}.bin + sc64-extra${{ steps.sc64version.outputs.replaced }}.zip + sc64-firmware${{ steps.sc64version.outputs.replaced }}.bin - name: Upload release assets if: github.event_name == 'release' && github.event.action == 'created' uses: softprops/action-gh-release@v0.1.15 with: files: | - sc64-extra${{ steps.sc64version.outputs.result }}.zip - sc64-firmware${{ steps.sc64version.outputs.result }}.bin + sc64-extra${{ steps.sc64version.outputs.replaced }}.zip + sc64-firmware${{ steps.sc64version.outputs.replaced }}.bin build-sc64-py: strategy: @@ -82,10 +78,12 @@ jobs: uses: actions/checkout@v3 - name: Set SC64 version - run: | - echo "$GITHUB_REF_NAME" - SC64_VERSION=-${GITHUB_REF_NAME//\//-} - echo "$SC64_VERSION" + uses: frabert/replace-string-action@v2 + id: sc64version + with: + pattern: '\/' + string: ${{ github.ref_name }} + replace-with: '-' - name: Setup python uses: actions/setup-python@v4 @@ -121,19 +119,19 @@ jobs: run: | mkdir package pushd dist - tar ${{ matrix.package-options }} ../package/${{ matrix.package-name }}${{ env.SC64_VERSION }}.${{ matrix.package-extension }} * + tar ${{ matrix.package-options }} ../package/${{ matrix.package-name }}${{ steps.sc64version.outputs.replaced }}.${{ matrix.package-extension }} * popd working-directory: sw/pc - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: ${{ matrix.package-name }}${{ env.SC64_VERSION }} - path: sw/pc/package/${{ matrix.package-name }}${{ env.SC64_VERSION }}.${{ matrix.package-extension }} + name: ${{ matrix.package-name }}${{ steps.sc64version.outputs.replaced }} + path: sw/pc/package/${{ matrix.package-name }}${{ steps.sc64version.outputs.replaced }}.${{ matrix.package-extension }} - name: Upload release assets if: github.event_name == 'release' && github.event.action == 'created' uses: softprops/action-gh-release@v0.1.15 with: files: | - sw/pc/package/${{ matrix.package-name }}${{ env.SC64_VERSION }}.${{ matrix.package-extension }} + sw/pc/package/${{ matrix.package-name }}${{ steps.sc64version.outputs.replaced }}.${{ matrix.package-extension }}