Don't use branch in win32 release zip name.

savonet · Jun 20, 2022 · c73b2c8 · c73b2c8
1 parent ce8314d
commit c73b2c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/scripts/build-win32.sh b/.github/scripts/build-win32.sh
@@ -6,7 +6,8 @@ SYSTEM=$1
 BRANCH=$2
 CPU_CORES=$3
 IS_ROLLING_RELEASE=$4
-GITHUB_SHA=$5
+IS_RELEASE=$5
+GITHUB_SHA=$6
 
 OPAM_PREFIX=`opam var prefix`
 VERSION=`opam show -f version . | cut -d'-' -f 1`
@@ -15,14 +16,16 @@ BASE_DIR=`cd "${PWD}/../.." && pwd`
 COMMIT_SHORT=`echo "${GITHUB_SHA}" | cut -c-7`
 
 if [ -n "${IS_ROLLING_RELEASE}" ]; then
-  TAG=${COMMIT_SHORT}
+  TAG=${COMMIT_SHORT}-
+elif [ -n "${IS_RELEASE}" ]; then
+  TAG=""
 else
-  TAG=${BRANCH}
+  TAG=${BRANCH}-
 fi
 
 if [ "${SYSTEM}" = "x64" ]; then
   HOST="x86_64-w64-mingw32.static"
-  BUILD="${TAG}-${VERSION}-win64"
+  BUILD="${TAG}${VERSION}-win64"
   PKG_CONFIG_PATH="/usr/src/mxe/usr/x86_64-w64-mingw32.static/lib/pkgconfig/"
 else
   HOST="i686-w64-mingw32.static"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -439,7 +439,7 @@ jobs:
           mkdir -p /tmp/${{ github.run_number }}/win32/dist
           chown -R opam /tmp/${{ github.run_number }}/win32/dist
           cd /tmp/${{ github.run_number }}/win32/liquidsoap
-          gosu opam:root ./.github/scripts/build-win32.sh ${{ matrix.system }} ${{ needs.build_details.outputs.branch }} ${{ steps.cpu_cores.outputs.count }} "${{ needs.build_details.outputs.is_rolling_release }}" ${{ github.sha }}
+          gosu opam:root ./.github/scripts/build-win32.sh ${{ matrix.system }} ${{ needs.build_details.outputs.branch }} ${{ steps.cpu_cores.outputs.count }} "${{ needs.build_details.outputs.is_rolling_release }}" "${{ needs.build_details.outputs.is_release }}" ${{ github.sha }}
         id: build
       - name: Upload artifact
         uses: actions/upload-artifact@v2