From ccf82d72dd3d9477b45b18a53c9c0214517a814d Mon Sep 17 00:00:00 2001
From: mario4tier <mario4tier@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:31:06 -0500
Subject: [PATCH] Add wix toolset installation

---
 .github/workflows/dev-nightly-tests.yml | 41 ++++++++++---------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/dev-nightly-tests.yml b/.github/workflows/dev-nightly-tests.yml
index a373b0e5..e568ed7c 100644
--- a/.github/workflows/dev-nightly-tests.yml
+++ b/.github/workflows/dev-nightly-tests.yml
@@ -26,20 +26,6 @@ jobs:
         with:
           ref: dev
 
-      - name: Install build tools (Linux)
-        if: runner.os == 'Linux'
-        shell: bash
-        run: |
-          sudo apt update && sudo apt install -y automake libtool autogen mcpp
-          sudo apt install -y openjdk-21-jdk
-          sudo apt install -y gcc-multilib
-          sudo apt install -y gcc-i686-linux-gnu
-          sudo apt install -y gcc-aarch64-linux-gnu
-
-      - name: Install Rust Toolchain (Linux)
-        if: runner.os == 'Linux'
-        uses: dtolnay/rust-toolchain@stable
-
       - name: Install Python
         uses: actions/setup-python@v5
         with:
@@ -51,25 +37,31 @@ jobs:
         run: |
           echo "PYTHON=python3" >> $GITHUB_ENV
 
-      - name: Create shell envs (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe > msbuild_path.txt
-          set /p MSBUILD_PATH=<msbuild_path.txt
-          set VCVARSALL=%MSBUILD_PATH%\..\..\..\..\VC\Auxiliary\Build\vcvarsall.bat
-          echo VCVARSALL=%VCVARSALL% >> %GITHUB_ENV%
-          echo PYTHON=python >> %GITHUB_ENV%
-
       - name: Build dist assets (Linux)
         if: runner.os == 'Linux'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
+          sudo apt update
+          sudo apt install -y automake libtool autogen mcpp
+          sudo apt install -y openjdk-21-jdk
+          sudo apt install -y gcc-multilib
+          sudo apt install -y gcc-i686-linux-gnu
+          sudo apt install -y gcc-aarch64-linux-gnu
           $PYTHON $GITHUB_WORKSPACE/scripts/package.py
           $PYTHON $GITHUB_WORKSPACE/scripts/test-dist.py
 
+      - name: Create shell envs (Windows x64)
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe > msbuild_path.txt
+          set /p MSBUILD_PATH=<msbuild_path.txt
+          set VCVARSALL=%MSBUILD_PATH%\..\..\..\..\VC\Auxiliary\Build\vcvarsall.bat
+          echo VCVARSALL=%VCVARSALL% >> %GITHUB_ENV%
+          echo PYTHON=python >> %GITHUB_ENV%
+
       - name: Build dist assets (Windows x64)
         if: runner.os == 'Windows'
         env:
@@ -77,6 +69,7 @@ jobs:
         shell: cmd
         run: |
           call "%VCVARSALL%" x64
+          dotnet tool install --global wix
           %PYTHON% %GITHUB_WORKSPACE%\scripts\package.py
           %PYTHON% %GITHUB_WORKSPACE%\scripts\test-dist.py