From 76ec2da20d3d76a13749b91afd251234293bfd16 Mon Sep 17 00:00:00 2001 From: Krystie Date: Wed, 8 Apr 2026 13:21:24 -0700 Subject: [PATCH] Force release asset versions to match tag --- .github/workflows/build-all.yml | 56 +++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index 40b311c..20951c8 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -62,12 +62,16 @@ jobs: mingw-w64-x86_64-miniupnpc mingw-w64-x86_64-zlib - - name: Set VERSION from source + - name: Set VERSION run: | - MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') - MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') - REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') - echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then + echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV + else + MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') + MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') + REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') + echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + fi - name: Configure run: | @@ -252,12 +256,16 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set VERSION from source + - name: Set VERSION run: | - MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') - MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') - REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') - echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then + echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV + else + MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') + MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') + REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') + echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + fi - name: Install dependencies run: | @@ -365,12 +373,16 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set VERSION from source + - name: Set VERSION run: | - MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') - MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') - REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') - echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then + echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV + else + MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') + MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') + REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') + echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + fi - name: Install dependencies run: | @@ -491,12 +503,16 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set VERSION from source + - name: Set VERSION run: | - MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') - MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') - REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') - echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then + echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV + else + MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}') + MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}') + REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}') + echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV + fi - name: Install dependencies run: |