From fbda4dea614a8887836bee3bae8619a37f809e28 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 21 Apr 2026 17:31:46 +0300 Subject: [PATCH] Windows: use msys64_20240113_prebuilt to prevent flaky downloads Current MSYS does not have a prebuild in ci-files01 cache, which makes the msys2 install script to use pacman to externally download, which can cause flakiness. The prebuilt was fetched from a parked Windows 11 24h2 x64 VM, by compressing: "C:\Utils\msys64" to .7z Pick-to: 6.11 6.8 Task-number: QTQAINFRA-7387 Change-Id: I4bd037a6d985fc1c007ba65d8f54a73d4183cb10 Reviewed-by: Tero Heikkinen --- coin/provisioning/common/windows/install-msys2.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 7a79d4ab..c8f3420f 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -9,10 +9,10 @@ $version = "20240113" $prog = "msys2" $arch = "x86_64" $sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6" -$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" +$sha1_prebuilt = "29d16a81de4a570c41f92491e20b5554a1baab8f" $folder = "msys64" -$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" +$package_prebuilt = $folder + "_" + $version + "_prebuilt_v2.7z" $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" $url_cache_prebuilt = "\\ci-files01-hki.ci.qt.io\provisioning\windows\$package_prebuilt"