From 3eda04622eca1b486ece166aee54a616a7ccda44 Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Thu, 28 Mar 2024 11:12:03 -0400 Subject: [PATCH] [CI:DOCS] Force WiX 3.11 Since all 4.9 versions expect 3.11 of the wix toolset, upgrading to 3.14 breaks builds of all other 4.9 podmans. Keep the v4.9 branch on 3.11 so we can build any of the 4.9 versions. Signed-off-by: Ashley Cui --- .github/workflows/upload-win-installer.yml | 2 +- contrib/win-installer/build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-win-installer.yml b/.github/workflows/upload-win-installer.yml index 3cf413cf9f..12093ad6bf 100644 --- a/.github/workflows/upload-win-installer.yml +++ b/.github/workflows/upload-win-installer.yml @@ -41,7 +41,7 @@ jobs: run: | Write-Output "::notice::This workflow execution will be a dry-run: ${{ steps.actual_dryrun.outputs.dryrun }}" - name: Install Wix - run: choco install wixtoolset --version=3.14.0 + run: choco install wixtoolset --version=3.11.2 - name: Determine version id: getversion run: | diff --git a/contrib/win-installer/build.ps1 b/contrib/win-installer/build.ps1 index 1c5200b48d..c8741563ea 100644 --- a/contrib/win-installer/build.ps1 +++ b/contrib/win-installer/build.ps1 @@ -99,7 +99,7 @@ if ($args.Count -lt 1 -or $args[0].Length -lt 1) { } # Pre-set to standard locations in-case build env does not refresh paths -$Env:Path="$Env:Path;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;;C:\Program Files\Go\bin" +$Env:Path="$Env:Path;C:\Program Files (x86)\WiX Toolset v3.11\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;;C:\Program Files\Go\bin" CheckRequirements