diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-21 17:20:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-21 17:20:54 (GMT) |
| commit | 127864aa9cf6067fe36472cff91ca1767f1df0f9 (patch) | |
| tree | 005e00a1ec809740dd08baff32695768d22b592e /.gitlab/os-windows.yml | |
| parent | 9d6e6b7d3b6eecb3b01152ba22c2dfc181fd033f (diff) | |
| parent | 8efbb0c95fe79f883973b6f36b718f95662c147c (diff) | |
| download | CMake-127864aa9cf6067fe36472cff91ca1767f1df0f9.zip CMake-127864aa9cf6067fe36472cff91ca1767f1df0f9.tar.gz CMake-127864aa9cf6067fe36472cff91ca1767f1df0f9.tar.bz2 | |
Merge branch 'backport-3.18-ci-wix-download' into ci-wix-download
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 2e21fdf..1fff2bb 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -74,9 +74,12 @@ ## Windows-specific scripts .before_script_windows: &before_script_windows + - Invoke-Expression -Command .gitlab/ci/wix.ps1 - Invoke-Expression -Command .gitlab/ci/cmake.ps1 - Invoke-Expression -Command .gitlab/ci/ninja.ps1 - $pwdpath = $pwd.Path + - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix" + - (& "$env:WIX\bin\light.exe" -help) | Select -First 1 - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab;$pwdpath\.gitlab\cmake\bin;$env:PATH" - cmake --version - ninja --version |