From 98712a618724ba6a83c946748dcb0ef4c4146e68 Mon Sep 17 00:00:00 2001
From: Jakob Gahde <j5lx@fmail.co.uk>
Date: Mon, 26 Feb 2024 01:50:17 +0100
Subject: [PATCH] Make WiX version explicit

---
 .github/actions/install-dependencies/action.yml      | 12 ++++++------
 .../install-dependencies/install-dependencies.sh     | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
index ab8d9f5f8..508dbd689 100644
--- a/.github/actions/install-dependencies/action.yml
+++ b/.github/actions/install-dependencies/action.yml
@@ -9,15 +9,15 @@ inputs:
 runs:
   using: composite
   steps:
-  - run: ${GITHUB_ACTION_PATH}/install-dependencies.sh
-    shell: bash
-    env:
-      RUNNER_OS: ${{runner.os}}
-      INPUT_ARCH: ${{inputs.arch}}
-      INPUT_QT: ${{inputs.qt}}
   - if: runner.os == 'Windows'
     uses: jurplel/install-qt-action@v3
     with:
       arch: ${{inputs.arch}}
       version: ${{matrix.qt == 6 && '6.4.2' || '5.15.2'}}
       modules: ${{matrix.qt == 6 && 'qtmultimedia' || ''}}
+  - run: ${GITHUB_ACTION_PATH}/install-dependencies.sh
+    shell: bash
+    env:
+      RUNNER_OS: ${{runner.os}}
+      INPUT_ARCH: ${{inputs.arch}}
+      INPUT_QT: ${{inputs.qt}}
diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh
index 5c8235cf3..2568758d1 100755
--- a/.github/actions/install-dependencies/install-dependencies.sh
+++ b/.github/actions/install-dependencies/install-dependencies.sh
@@ -51,13 +51,15 @@ setup_macos() {
 }
 
 setup_windows() {
-  pip install --ignore-requires-python translate-toolkit[rc]
+  pip install translate-toolkit[rc]
   curl -fsSLO https://okapiframework.org/binaries/main/1.45.0/okapi-apps_win32-x86_64_1.45.0.zip
   mkdir okapi
   "${WINDIR}\\System32\\tar" xfC okapi-apps_win32-x86_64_1.45.0.zip okapi
-  dotnet tool install -g wix
-  wix extension add -g WixToolset.Util.wixext WixToolset.Bal.wixext
-  nuget install -x -OutputDirectory util/installer WixToolset.BalUtil
+  dotnet tool install -g wix --version 4.0.4
+  wix extension add -g WixToolset.Util.wixext/4.0.4 WixToolset.Bal.wixext/4.0.4
+  nuget install -x -OutputDirectory util/installer WixToolset.BootstrapperCore.Native -Version 4.0.4
+  nuget install -x -OutputDirectory util/installer WixToolset.DUtil -Version 4.0.4
+  nuget install -x -OutputDirectory util/installer WixToolset.BalUtil -Version 4.0.4
 }
 
 "setup_$(echo "${RUNNER_OS}" | tr '[A-Z]' '[a-z]')"