From 278516d142745403fde1a9b272712b8d71ac59d9 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 16 Nov 2021 12:56:27 +0200 Subject: Provisioning: Change using GitHub package for MinGW 11.2.0 Pick-to: 6.2 Pick-to: 6.2.2 Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327 Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot --- coin/provisioning/common/windows/install-mingw.ps1 | 3 ++- coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 | 4 ++-- .../qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 6fd3de24..1b237339 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -47,9 +47,10 @@ function InstallMinGW $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" + $url_original = "https://github.com/cristianadam/mingw-builds/releases/download/v" + $version + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" - Download $url_cache $url_cache $mingwPackage + Download $url_original $url_cache $mingwPackage Verify-Checksum $mingwPackage $sha1 Extract-7Zip $mingwPackage $TARGETDIR diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 index 921bf23b..d6aaa064 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 @@ -3,9 +3,9 @@ # This script will install 64-bit MinGW 11.2.0 # Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW -$release = "mingw-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1" +$release = "MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1" -$sha1 = "5554791dc13468bf44e2e519c6691f2deecd000c" +$sha1 = "76bbfd135633d3d414e06cd7bf70cae94d2311db" InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1 index 921bf23b..d6aaa064 100644 --- a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1 +++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1 @@ -3,9 +3,9 @@ # This script will install 64-bit MinGW 11.2.0 # Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW -$release = "mingw-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1" +$release = "MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1" -$sha1 = "5554791dc13468bf44e2e519c6691f2deecd000c" +$sha1 = "76bbfd135633d3d414e06cd7bf70cae94d2311db" InstallMinGW $release $sha1 -- cgit v1.2.3