aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJøger Hansegård <joger.hansegard@qt.io>2024-02-20 13:51:07 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-01 10:11:05 +0000
commit843347022011af87b337d6a2d52b2bc18009ce4b (patch)
tree16603f9cd200c2035512337a8ddd50af1b08b5ff
parent8301dde957880035f49e9e7cb47c21d8b7bd1605 (diff)
Upgrade to msys2 20240113 in Windows provisioning
This upgrade is needed because msys2 20220319 fails to install diffutils. Its url is broken. Diffutils was first added on 6.5 Fixes: QTBUG-122465 Pick-to: 6.5 Change-Id: If94cafed68f3400557e01365e743155e9b732dac Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit 04910ff9466cc87457fd04d68c101f0a38d304f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit cabe404c4afe3ada34ead301d804f5bc26a4416f)
-rw-r--r--coin/provisioning/common/windows/install-msys2.ps14
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1
index 6a555274..46336255 100644
--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -5,10 +5,10 @@
# This script will installs msys2
-$version = "20220319"
+$version = "20240113"
$prog = "msys2"
$arch = "x86_64"
-$sha1 = "d3d05090c09c08a47efbffe469142b45231cbc89"
+$sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6"
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
$folder = "msys64"