Replace MinGW 8.1 with MinGW 11.2.0 in CI

Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW

Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Heikki Halmet
2021-09-29 16:36:46 +03:00
parent 134a8546c6
commit ce9ef40366
12 changed files with 60 additions and 84 deletions

View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,23 +37,19 @@ function InstallMinGW
{
Param (
[string] $release = $(BadParam("release file name")),
[string] $sha1 = $(BadParam("SHA1 checksum of the file")),
[string] $suffix = ""
[string] $sha1 = $(BadParam("SHA1 checksum of the file"))
)
$arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
$null, $null, $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
if ($arch -eq "i686") { $win_arch = "Win32" }
elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
$envvar = "MINGW$version$suffix"
if ($arch -eq "x86_64") { $win_arch = "Win64" }
$envvar = "MINGW$version"
$envvar = $envvar -replace '["."]'
$targetdir = "C:\$envvar"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
$url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $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_official $url_cache $mingwPackage
Download $url_cache $url_cache $mingwPackage
Verify-Checksum $mingwPackage $sha1
Extract-7Zip $mingwPackage $TARGETDIR

View File

@@ -0,0 +1,11 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# 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"
$sha1 = "5554791dc13468bf44e2e519c6691f2deecd000c"
InstallMinGW $release $sha1

View File

@@ -1,11 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install MinGW 8.1.0
$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0"
$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb"
$suffix = "_i686"
InstallMinGW $release $sha1 $suffix

View File

@@ -1,10 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 8.1.0
$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0"
$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c"
InstallMinGW $release $sha1

View File

@@ -0,0 +1,11 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# 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"
$sha1 = "5554791dc13468bf44e2e519c6691f2deecd000c"
InstallMinGW $release $sha1

View File

@@ -1,11 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install MinGW 8.1.0
$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0"
$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb"
$suffix = "_i686"
InstallMinGW $release $sha1 $suffix

View File

@@ -1,10 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install 64-bit MinGW 8.1.0
$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0"
$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c"
InstallMinGW $release $sha1