ci: revert if and use wix config

tari-project · Nov 25, 2024 · a85e186 · a85e186
1 parent c13bd14
commit a85e186
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml
@@ -63,7 +63,6 @@ jobs:
                   AIRDROP_API_BASE_URL: ${{ secrets.BETA_AIRDROP_API_BASE_URL }}
                   AIRDROP_TWITTER_AUTH_URL: ${{ secrets.BETA_AIRDROP_TWITTER_AUTH_URL }}
                   BETA_BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
-                  VERSION_DATE_PREFIX: ${{ startsWith(runner.os,'Windows') && '.' }}
               shell: bash
               run: |
                   #set -xueo pipefail
@@ -77,17 +76,18 @@ jobs:
                   # numeric-only and cannot be greater than 65535 for msi target
                   export BETA_DATE=4$(date +%m%d)
                   cd "${GITHUB_WORKSPACE}/src-tauri"
-                  echo "releaseName=Tari Universe ${{ env.BETA_STRING }} v__VERSION__${{ env.VERSION_DATE_PREFIX || '-' }}${BETA_DATE}" >> $GITHUB_ENV
+                  echo "releaseName=Tari Universe ${{ env.BETA_STRING }} v__VERSION__-${BETA_DATE}" >> $GITHUB_ENV
                   # Don't mess with the double quotes and inner escaped quotes
                   yq eval ".productName = \"Tari Universe ${{ env.BETA_STRING }}\"" -i tauri.conf.json
                   yq eval ".mainBinaryName = \"Tari Universe ${{ env.BETA_STRING }}\"" -i tauri.conf.json
-                  yq eval ".version += \"${{ env.VERSION_DATE_PREFIX || '-' }}${BETA_DATE}\"" -i tauri.conf.json
+                  yq eval ".version += \"-${BETA_DATE}\"" -i tauri.conf.json
+                  yq eval ".bundle.windows.wix.version = \"__VERSION__.${BETA_DATE}\"" -i tauri.conf.json
                   yq eval ".app.windows[0].title = \"Tari Universe ${{ env.BETA_STRING }} | Testnet\"" -i tauri.conf.json
                   yq eval ".identifier = \"com.tari.universe.beta\"" -i tauri.conf.json
                   yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/${{ env.BETA_BRANCH_NAME }}/.updater/beta-latest.json\"]" \
                     -i tauri.conf.json
                   cat tauri.conf.json
-                  sed -i.bak -E "s/^version\s*=\s*\"([0-9]+\.[0-9]+\.[0-9]+)\"/version = \"\1${{ env.VERSION_DATE_PREFIX || '-' }}${BETA_DATE}\"/" \
+                  sed -i.bak -E "s/^version\s*=\s*\"([0-9]+\.[0-9]+\.[0-9]+)\"/version = \"\1-${BETA_DATE}\"/" \
                     Cargo.toml
                   cat Cargo.toml
                   sed -i.bak -e "s/\"icons\//\"beta-icons\//g" tauri.conf.json