From 4c32b3690de4d1c1018ee5b17562fc4d8c7ed16f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Feb 2024 09:04:18 -0500 Subject: ci: update to WiX 3.14.0.8606 release This official 3.14 release supports the `arm64` architecture. Previously we used a development version for that. --- .gitlab/ci/wix.ps1 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab/ci/wix.ps1 b/.gitlab/ci/wix.ps1 index b7cb3f3..53a5013 100755 --- a/.gitlab/ci/wix.ps1 +++ b/.gitlab/ci/wix.ps1 @@ -1,15 +1,14 @@ $erroractionpreference = "stop" -$release = "v3.14.0.6526" -$sha256sum = "4C89898DF3BCAB13E12F7CA54399C35AD273475AD2CB6284611D00AE2D063C2C" -$filename = "wix-3.14.0.6526-win-i386" +$release = "wix314rtm" +$sha256sum = "13F067F38969FAF163D93A804B48EA0576790A202C8F10291F2000F0E356E934" +$filename = "wix314-binaries" $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://cmake.org/files/dependencies/$tarball" -OutFile "$outdir\$tarball" +Invoke-WebRequest -Uri "https://github.com/wixtoolset/wix3/releases/download/$release/$tarball" -OutFile "$outdir\$tarball" $hash = Get-FileHash "$outdir\$tarball" -Algorithm SHA256 if ($hash.Hash -ne $sha256sum) { exit 1 -- cgit v0.12 From adb6af6959b36bd7860bf7407a4e854a74dcbad8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Feb 2024 13:07:21 -0500 Subject: ci: host WiX 3.14.0.8606 binaries ourselves Follow the approach from commit 9ff7fffbf4 (ci: host WiX 3.14.0.6526 binaries ourselves, 2022-08-02, v3.24.0~6^2) for the updated version. Since we use WiX to package our official release binaries, avoid relying on an externally-hosted package by hosting it at `cmake.org`. --- .gitlab/ci/wix.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/wix.ps1 b/.gitlab/ci/wix.ps1 index 53a5013..9313c0f 100755 --- a/.gitlab/ci/wix.ps1 +++ b/.gitlab/ci/wix.ps1 @@ -2,13 +2,15 @@ $erroractionpreference = "stop" $release = "wix314rtm" $sha256sum = "13F067F38969FAF163D93A804B48EA0576790A202C8F10291F2000F0E356E934" -$filename = "wix314-binaries" +#$filename = "wix314-binaries" +$filename = "wix-3.14.0.8606-win-i386" $tarball = "$filename.zip" $outdir = $pwd.Path $outdir = "$outdir\.gitlab" $ProgressPreference = 'SilentlyContinue' -Invoke-WebRequest -Uri "https://github.com/wixtoolset/wix3/releases/download/$release/$tarball" -OutFile "$outdir\$tarball" +#Invoke-WebRequest -Uri "https://github.com/wixtoolset/wix3/releases/download/$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 -- cgit v0.12