Fix rpm normalized file name

foxypool · Feb 6, 2022 · 1ba2881 · 1ba2881
1 parent 6de12e0
commit 1ba2881
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/.github/workflows/build-linux-installer-rpm.yml b/.github/workflows/build-linux-installer-rpm.yml
@@ -47,7 +47,10 @@ jobs:
         python3 -m venv ../venv
         . ../venv/bin/activate
         pip3 install setuptools_scm
-        echo "::set-output name=CHIVES_INSTALLER_VERSION::$(python3 ./build_scripts/installer-version.py)"
+        CHIVES_INSTALLER_VERSION=$(python3 ./build_scripts/installer-version.py)
+        CHIVES_INSTALLER_VERSION_NORMALIZED=${CHIVES_INSTALLER_VERSION//-/\.}
+        echo "::set-output name=CHIVES_INSTALLER_VERSION::$CHIVES_INSTALLER_VERSION"
+        echo "::set-output name=CHIVES_INSTALLER_VERSION_NORMALIZED::$CHIVES_INSTALLER_VERSION_NORMALIZED"
         deactivate
 
     - name: Test for secrets access
@@ -93,15 +96,15 @@ jobs:
     - name: Upload to s3
       if: steps.check_secrets.outputs.HAS_SECRET
       env:
-          CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION }}
+          CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION_NORMALIZED }}
       run: |
           ls $GITHUB_WORKSPACE/build_scripts/final_installer/
           aws s3 cp $GITHUB_WORKSPACE/build_scripts/final_installer/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm s3://download-chives-net/builds/
 
     - name: Create Checksums
       if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main'
       env:
-        CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION }}
+        CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION_NORMALIZED }}
       run: |
          ls $GITHUB_WORKSPACE/build_scripts/final_installer/
          sha256sum $GITHUB_WORKSPACE/build_scripts/final_installer/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm > $GITHUB_WORKSPACE/build_scripts/final_installer/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm.sha256
@@ -115,7 +118,7 @@ jobs:
     - name: Create .rpm torrent
       if: startsWith(github.ref, 'refs/tags/')
       env:
-        CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION }}
+        CHIVES_INSTALLER_VERSION: ${{ steps.version_number.outputs.CHIVES_INSTALLER_VERSION_NORMALIZED }}
       run: |
           py3createtorrent -f -t udp://tracker.opentrackr.org:1337/announce $GITHUB_WORKSPACE/build_scripts/final_installer/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm -o $GITHUB_WORKSPACE/build_scripts/final_installer/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm.torrent --webseed https://download-chives-net.s3.us-west-2.amazonaws.com/install/chives-blockchain-${CHIVES_INSTALLER_VERSION}-1.x86_64.rpm
           ls