From 9b0dc652ffc328394e70bf6ee015b50cfefa4125 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 26 Apr 2023 15:46:11 -0400 Subject: ci: Provide Inno Setup tools to some Windows CI jobs --- .gitlab/.gitignore | 1 + .gitlab/ci/env_windows_vs2022_x64_ninja.ps1 | 1 + .gitlab/ci/innosetup-env.ps1 | 4 ++++ .gitlab/ci/innosetup.ps1 | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100755 .gitlab/ci/innosetup-env.ps1 create mode 100755 .gitlab/ci/innosetup.ps1 (limited to '.gitlab') diff --git a/.gitlab/.gitignore b/.gitlab/.gitignore index 10d03cacd4..381d8fea96 100644 --- a/.gitlab/.gitignore +++ b/.gitlab/.gitignore @@ -3,6 +3,7 @@ /bcc* /cmake* /ispc* +/innosetup /jom /llvm* /mingw diff --git a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 index a96658dd0f..50a03ca828 100755 --- a/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 +++ b/.gitlab/ci/env_windows_vs2022_x64_ninja.ps1 @@ -1,3 +1,4 @@ if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { + . ".gitlab/ci/innosetup-env.ps1" . ".gitlab/ci/ispc-env.ps1" } diff --git a/.gitlab/ci/innosetup-env.ps1 b/.gitlab/ci/innosetup-env.ps1 new file mode 100755 index 0000000000..96e9d8c322 --- /dev/null +++ b/.gitlab/ci/innosetup-env.ps1 @@ -0,0 +1,4 @@ +$pwdpath = $pwd.Path +& "$pwsh" -File ".gitlab/ci/innosetup.ps1" +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\innosetup;$env:PATH" +ISCC 2>$null | Select -First 1 diff --git a/.gitlab/ci/innosetup.ps1 b/.gitlab/ci/innosetup.ps1 new file mode 100755 index 0000000000..a7f4eb31c3 --- /dev/null +++ b/.gitlab/ci/innosetup.ps1 @@ -0,0 +1,20 @@ +$erroractionpreference = "stop" + +$version = "6.2.2-1" +$sha256sum = "34D5311070678617424628A88C8A7F7BE41157B1A59112F9DFDA1D7EFD4469CC" +$filename = "innosetup-$version" +$tarball = "$filename.zip" + +$outdir = $pwd.Path +$outdir = "$outdir\.gitlab" +$ProgressPreference = 'SilentlyContinue' +Invoke-WebRequest -Uri "https://cmake.org/files/dependencies/internal/$tarball" -OutFile "$outdir\$tarball" +$hash = Get-FileHash "$outdir\$tarball" -Algorithm SHA256 +if ($hash.Hash -ne $sha256sum) { + exit 1 +} + +Add-Type -AssemblyName System.IO.Compression.FileSystem +[System.IO.Compression.ZipFile]::ExtractToDirectory("$outdir\$tarball", "$outdir") +Move-Item -Path "$outdir\$filename" -Destination "$outdir\innosetup" +Remove-Item "$outdir\$tarball" -- cgit v1.2.1