Jelajahi Sumber

Merge topic 'ci-wix-host' into release-3.24

9ff7fffbf4 ci: host WiX 3.14.0.6526 binaries ourselves

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7538
Brad King 3 tahun lalu
induk
melakukan
a9d0bcc71e
1 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 3 2
      .gitlab/ci/wix.ps1

+ 3 - 2
.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