Propably working implementation

Misieq01 · Oct 16, 2024 · d9faa9b · d9faa9b
1 parent cd464aa
commit d9faa9b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -229,6 +229,10 @@ jobs:
                   includeRelease: true
                   args: ${{ matrix.args }} --features "${{ env.TS_FEATURES }}"
 
+            - name: Build WiX on Windows
+              run: wix build .\tari-win-bundler\Bundle.wxs
+              if: runner.os == 'Windows'
+
             - name: Debug step {artifactPaths}
               if: ${{ true }}
               continue-on-error: true
@@ -237,6 +241,16 @@ jobs:
               shell: bash
               run: echo "Artifact ID from previous job is $artifactPaths"
 
+            - name: Upload Wix installer
+              if: runner.os == 'Windows'
+              uses: actions/upload-artifact@v4
+              env:
+                  TARI_UNIVERSE_INSTALLER_NAME: Tari.Universe_${{ steps.build.outputs.appVersion }}_x64_en-US.msi
+                  TARI_UNIVERSE_APP_VERSION: ${{ steps.build.outputs.appVersion }}
+              with:
+                  name: tari-universe-beta_${{ steps.build.outputs.appVersion }}_wix
+                  path: .\tari-win-bundler\bin\Debug\tari_win_bundler.exe
+
             - name: Upload none releases
               if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}
               uses: actions/upload-artifact@v4

diff --git a/tari-win-bundler/Bundle.wxs b/tari-win-bundler/Bundle.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 	<Bundle Name="Tari Universe (Alpha)"
-            Version="0.5.13"
+            Version=$(env.TARI_UNIVERSE_APP_VERSION)
             Manufacturer="Tari Labs, LLC"
             UpgradeCode="ed60939d-f2b8-5b6e-a7af-bd0d5cf13e37">
 
@@ -108,7 +108,7 @@
 
 			<!-- Tari Universe x64 -->
 			<MsiPackage
-				SourceFile=".\executables\Tari Universe (Alpha)_0.5.22_x64_en-US.msi"
+				SourceFile="..\src-tauri\target\release\bundle\msi\$(env.TARI_UNIVERSE_INSTALLER_NAME)"
 				After="VC_REDIST_X64"
 				InstallCondition="VersionNT64"
 				DisplayInternalUI="yes"

diff --git a/tari-win-bundler/executables/Tari Universe (Alpha)_0.5.22_x64_en-US.msi b/tari-win-bundler/executables/Tari Universe (Alpha)_0.5.22_x64_en-US.msi