diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-03 13:37:37 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-03 09:37:54 -0400 |
| commit | a9d0bcc71ec2c79c6d75b143e5c053f0b7ea01f1 (patch) | |
| tree | 80c4abc10d32cf9aa6c646f301239ff5a666a363 | |
| parent | e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d (diff) | |
| parent | 9ff7fffbf492ae32a57b2768a3025aa3521aabe4 (diff) | |
| download | cmake-a9d0bcc71ec2c79c6d75b143e5c053f0b7ea01f1.tar.gz | |
Merge topic 'ci-wix-host' into release-3.24
9ff7fffbf4 ci: host WiX 3.14.0.6526 binaries ourselves
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7538
| -rwxr-xr-x | .gitlab/ci/wix.ps1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/ci/wix.ps1 b/.gitlab/ci/wix.ps1 index a69053303e..b7cb3f3402 100755 --- a/.gitlab/ci/wix.ps1 +++ b/.gitlab/ci/wix.ps1 @@ -2,13 +2,14 @@ $erroractionpreference = "stop" $release = "v3.14.0.6526" $sha256sum = "4C89898DF3BCAB13E12F7CA54399C35AD273475AD2CB6284611D00AE2D063C2C" -$filename = "wix314-binaries" +$filename = "wix-3.14.0.6526-win-i386" $tarball = "$filename.zip" $outdir = $pwd.Path $outdir = "$outdir\.gitlab" $ProgressPreference = 'SilentlyContinue' -Invoke-WebRequest -Uri "https://wixtoolset.org/downloads/$release/$tarball" -OutFile "$outdir\$tarball" +#Invoke-WebRequest -Uri "https://wixtoolset.org/downloads/$release/$tarball" -OutFile "$outdir\$tarball" +Invoke-WebRequest -Uri "https://cmake.org/files/dependencies/$tarball" -OutFile "$outdir\$tarball" $hash = Get-FileHash "$outdir\$tarball" -Algorithm SHA256 if ($hash.Hash -ne $sha256sum) { exit 1 |