aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-09-29 16:36:46 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2021-10-25 11:39:07 +0300
commitce9ef403661f140bc676995875171750c5013d00 (patch)
tree258360f6b257b6b746d4c709b419faa79b1399ca /coin
parent134a8546c657a322e2a860ccaab843b13eab6f7f (diff)
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>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/cmake_platforms.yaml12
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_windows.yaml32
-rw-r--r--coin/platform_configs/cmake_platforms_wasm.yaml8
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml6
-rw-r--r--coin/platform_configs/qtwebkit.yaml4
-rw-r--r--coin/provisioning/common/windows/install-mingw.ps118
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps110
-rw-r--r--coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps111
-rw-r--r--coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810.ps111
-rw-r--r--coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810_64.ps110
12 files changed, 60 insertions, 84 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 9ba50eae..0a6dffba 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -169,25 +169,25 @@ Configurations:
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
-
- Id: 'Windows10-Mingw8-x64-host'
+ Id: 'Windows10-Mingw11-x64-host'
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
-
- Id: 'Windows10_21H1-Mingw8-x64-host'
+ Id: 'Windows10_21H1-Mingw11-x64-host'
Template: 'qtci-windows-10_21H1-x86_64-52'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
@@ -210,10 +210,10 @@ Configurations:
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
- Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+ Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
index e2884f64..ec9238c7 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -6,10 +6,10 @@ Configurations:
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw8-x64-host'
+ Platform dependency: 'Windows10-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
@@ -21,10 +21,10 @@ Configurations:
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H1-Mingw8-x64-host'
+ Platform dependency: 'Windows10_21H1-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
@@ -33,10 +33,10 @@ Configurations:
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw8-x64-host'
+ Platform dependency: 'Windows10-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
@@ -48,10 +48,10 @@ Configurations:
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H1-Mingw8-x64-host'
+ Platform dependency: 'Windows10_21H1-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
@@ -60,10 +60,10 @@ Configurations:
Target arch: 'x86'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw8-x64-host'
+ Platform dependency: 'Windows10-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
@@ -75,10 +75,10 @@ Configurations:
Target arch: 'x86'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H1-Mingw8-x64-host'
+ Platform dependency: 'Windows10_21H1-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
@@ -87,10 +87,10 @@ Configurations:
Target arch: 'x86_64'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw8-x64-host'
+ Platform dependency: 'Windows10-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
@@ -102,10 +102,10 @@ Configurations:
Target arch: 'x86_64'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H1-Mingw8-x64-host'
+ Platform dependency: 'Windows10_21H1-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index 26fe3efd..509fb704 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -15,10 +15,10 @@ Configurations:
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10-Mingw8-x64-host'
+ Platform dependency: 'Windows10-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_pkg_config=OFF']
@@ -27,10 +27,10 @@ Configurations:
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H1-Mingw8-x64-host'
+ Platform dependency: 'Windows10_21H1-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
- 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\bin;{{.Env.Path}}',
+ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_pkg_config=OFF']
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index b8ecde4a..acc88bbf 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -3,19 +3,19 @@ Configurations:
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
Features: ['UseLegacyInstructions']
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions', 'Insignificant']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
-
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
index 4ebb60f1..a00e6ae7 100644
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -3,13 +3,13 @@ Configurations:
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Compiler: 'Mingw'
- Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+ Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1
index aadc8c46..6fd3de24 100644
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -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
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
new file mode 100644
index 00000000..921bf23b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1
@@ -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
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1
deleted file mode 100644
index fa8edb85..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1
+++ /dev/null
@@ -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
-
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1
deleted file mode 100644
index b712c2b3..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1
+++ /dev/null
@@ -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
-
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
new file mode 100644
index 00000000..921bf23b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1
@@ -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
+
diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810.ps1
deleted file mode 100644
index fa8edb85..00000000
--- a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810.ps1
+++ /dev/null
@@ -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
-
-
diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810_64.ps1
deleted file mode 100644
index b712c2b3..00000000
--- a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw810_64.ps1
+++ /dev/null
@@ -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
-