summaryrefslogtreecommitdiffstats
path: root/.gitlab/os-windows.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-03-14 15:34:35 (GMT)
committerBrad King <brad.king@kitware.com>2024-03-14 15:51:04 (GMT)
commitb71b6300e50783dca2ca65d9fa43276492ef9a57 (patch)
tree8ec4254c22d815bb8b708a71e8d0428a5271efac /.gitlab/os-windows.yml
parent694f14f96f8f64725461a585e3c1d11a9b00aec3 (diff)
downloadCMake-b71b6300e50783dca2ca65d9fa43276492ef9a57.zip
CMake-b71b6300e50783dca2ca65d9fa43276492ef9a57.tar.gz
CMake-b71b6300e50783dca2ca65d9fa43276492ef9a57.tar.bz2
ci: Provide WiX 3 in versioned location
Prepare to provide multiple WiX major versions for testing.
Diffstat (limited to '.gitlab/os-windows.yml')
-rw-r--r--.gitlab/os-windows.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index b6678b4..94e35f3 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -387,8 +387,8 @@
.before_script_windows: &before_script_windows
- . .gitlab/ci/env.ps1
- $pwdpath = $pwd.Path
- - (& "$pwsh" -File ".gitlab/ci/wix.ps1")
- - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix"
+ - (& "$pwsh" -File ".gitlab/ci/wix3.ps1")
+ - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix3"
- (& "$pwsh" -File ".gitlab/ci/cmake.ps1")
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH"
- $cmake = "cmake"