diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-14 15:34:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-14 15:51:04 (GMT) |
| commit | b71b6300e50783dca2ca65d9fa43276492ef9a57 (patch) | |
| tree | 8ec4254c22d815bb8b708a71e8d0428a5271efac /.gitlab | |
| parent | 694f14f96f8f64725461a585e3c1d11a9b00aec3 (diff) | |
| download | CMake-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')
| -rw-r--r-- | .gitlab/.gitignore | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/wix3.ps1 (renamed from .gitlab/ci/wix.ps1) | 3 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/.gitignore b/.gitlab/.gitignore index 4afdad3..fd9cf8b 100644 --- a/.gitlab/.gitignore +++ b/.gitlab/.gitignore @@ -21,6 +21,6 @@ /tmp /unstable-jom* /watcom -/wix* +/wix3 /clang-tidy-fixes /num_warnings.txt diff --git a/.gitlab/ci/wix.ps1 b/.gitlab/ci/wix3.ps1 index 9313c0f..8f5ae4b 100755 --- a/.gitlab/ci/wix.ps1 +++ b/.gitlab/ci/wix3.ps1 @@ -17,4 +17,5 @@ if ($hash.Hash -ne $sha256sum) { } Add-Type -AssemblyName System.IO.Compression.FileSystem -[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix\bin") +[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir\wix3") +Remove-Item "$outdir\$tarball" 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" |