aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.d
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2023-08-01 14:03:58 +0100
committerThomas Huth <thuth@redhat.com>2023-08-03 13:04:47 +0200
commit46aedd34b459a9e0ff7f61d554368b27910dd56d (patch)
treef870751f6608123fe7d87189e9010e7e30b0090a /.gitlab-ci.d
parentb64052cdada197a06fd7ffe1ba239d4de8b89d45 (diff)
gitlab: always use updated msys installer
We current reference an msys installer binary from mid-2022, which means after installation, it immediately has to re-download a bunch of newer content. This wastes precious CI time. The msys project publishes an installer binary with a fixed URL that always references the latest content. We cache the downloads in gitlab though and so once downloaded we would never re-fetch the installer leading back to the same problem. To deal with this we also fetch the pgp signature for the installer on every run, and compare that to the previously cached signature. If the signature changes, we re-download the full installer. This ensures we always have the latest installer for msys, while also maximising use of the gitlab cache. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20230801130403.164060-4-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '.gitlab-ci.d')
-rw-r--r--.gitlab-ci.d/windows.yml30
1 files changed, 27 insertions, 3 deletions
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 831b080d12..0bc04ad068 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -23,10 +23,34 @@
- If ( !(Test-Path -Path msys64\var\cache ) ) {
mkdir msys64\var\cache
}
- - If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
+ - Invoke-WebRequest
+ "https://repo.msys2.org/distrib/msys2-x86_64-latest.sfx.exe.sig"
+ -outfile "msys2.exe.sig"
+ - if ( Test-Path -Path msys64\var\cache\msys2.exe.sig ) {
+ Write-Output "Cached installer sig" ;
+ if ( ((Get-FileHash msys2.exe.sig).Hash -ne (Get-FileHash msys64\var\cache\msys2.exe.sig).Hash) ) {
+ Write-Output "Mis-matched installer sig, new installer download required" ;
+ Remove-Item -Path msys64\var\cache\msys2.exe.sig ;
+ if ( Test-Path -Path msys64\var\cache\msys2.exe ) {
+ Remove-Item -Path msys64\var\cache\msys2.exe
+ }
+ } else {
+ Write-Output "Matched installer sig, cached installer still valid"
+ }
+ } else {
+ Write-Output "No cached installer sig, new installer download required" ;
+ if ( Test-Path -Path msys64\var\cache\msys2.exe ) {
+ Remove-Item -Path msys64\var\cache\msys2.exe
+ }
+ }
+ - if ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
+ Write-Output "Fetching latest installer" ;
Invoke-WebRequest
- "https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe"
- -outfile "msys64\var\cache\msys2.exe"
+ "https://repo.msys2.org/distrib/msys2-x86_64-latest.sfx.exe"
+ -outfile "msys64\var\cache\msys2.exe" ;
+ Copy-Item -Path msys2.exe.sig -Destination msys64\var\cache\msys2.exe.sig
+ } else {
+ Write-Output "Using cached installer"
}
- Write-Output "Invoking msys2.exe installer at $(Get-Date -Format u)"
- msys64\var\cache\msys2.exe -y