opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-24 18:12:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CI:DOCS] Force WiX 3.11

Browse Source 
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 <acui@redhat.com>
This commit is contained in:
Ashley Cui
2024-03-28 11:12:03 -04:00
parent 23b0ca8155
commit 3eda04622e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/upload-win-installer.yml vendored
View File

@ -41,7 +41,7 @@ jobs:
run: | run: |
Write-Output "::notice::This workflow execution will be a dry-run: ${{ steps.actual_dryrun.outputs.dryrun }}" Write-Output "::notice::This workflow execution will be a dry-run: ${{ steps.actual_dryrun.outputs.dryrun }}"
- name: Install Wix - name: Install Wix
run: choco install wixtoolset --version=3.14.0 run: choco install wixtoolset --version=3.11.2
- name: Determine version - name: Determine version
id: getversion id: getversion
run: | run: |

2
contrib/win-installer/build.ps1
View File

@ -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 # 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 CheckRequirements