aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-11-04 14:12:18 +0000
committerHeikki Halmet <heikki.halmet@qt.io>2022-12-23 06:35:13 +0000
commit2db3661e5675a4a3a57c51aede2854f78f1cb613 (patch)
tree4177933aa14525cce99259743fcbcbbb0c7d9394 /coin/platform_configs
parent56a8d5a74d03e1180d15ef47a6a75da9a33cccb3 (diff)
Add Windows 10 22H2 to CI
Pre-installed to tier 1: MSVC 2022 17.3.6 plus build tools MSVC 2019 16.11.20 plus build tools MSVC 2015 update 3 14.0.25420.1 Task-number: QTQAINFRA-5262 Change-Id: Ibcc2950dd7edef0d6aa92cef7e602a69da8498d9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit e9b3497c8e8c6f50947f23a9a22bdc69d3674239)
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/cmake_platforms.yaml22
-rw-r--r--coin/platform_configs/cmake_platforms_static_tests.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_target_android.yaml4
-rw-r--r--coin/platform_configs/flashing-wizard.yaml4
-rw-r--r--coin/platform_configs/nightly_qnx710_host_windows.yaml6
-rw-r--r--coin/platform_configs/precheck.yaml2
-rw-r--r--coin/platform_configs/qt-creator.yaml2
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml4
-rw-r--r--coin/platform_configs/qtwebkit.yaml2
-rw-r--r--coin/platform_configs/tqtc-android-automotive.yaml4
10 files changed, 26 insertions, 26 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 6e41a238..b1a75217 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -42,7 +42,7 @@ Configurations:
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
]
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -59,7 +59,7 @@ Configurations:
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -79,8 +79,8 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
- Id: 'Windows10_21H2-MSVC2019-x64-host'
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Id: 'Windows10_22H2-MSVC2019-x64-host'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
@@ -90,11 +90,11 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
]
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
- Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
+ Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
@@ -151,8 +151,8 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
]
-
- Id: 'Windows10_21H2-Mingw11-x64-host'
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Id: 'Windows10_22H2-Mingw11-x64-host'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
@@ -164,8 +164,8 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
]
-
- Id: 'Windows10_21H2-LLVM-x64-host'
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Id: 'Windows10_22H2-LLVM-x64-host'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
@@ -188,7 +188,7 @@ Configurations:
'LLVM_INSTALL_DIR=C:\llvm-mingw'
]
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml
index da61e30c..d87d0edc 100644
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -10,7 +10,7 @@ Configurations:
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
]
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml
index 831341f8..3cb87c10 100644
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -17,12 +17,12 @@ Configurations:
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
- Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+ Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
index ceac201f..9a09411d 100644
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -7,7 +7,7 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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% -static -no-icu'
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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% -static -no-icu'
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions']
diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml
index eef6d3c9..852b6f78 100644
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,17 +1,17 @@
Version: 2
Include: [
cmake_platforms.yaml: [
- Windows10_21H2-MSVC2019-x64-host
+ Windows10_22H2-MSVC2019-x64-host
]
]
Configurations:
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'MSVC2019'
Target compiler: 'QCC'
- Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
+ Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
Features: ['DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml
index e71c02d8..25583ec1 100644
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -3,7 +3,7 @@ Module only: True
Include: [
cmake_platforms.yaml: [
"Ubuntu-20.04-host",
- "Windows10_21H2-MSVC2019-x64-host",
+ "Windows10_22H2-MSVC2019-x64-host",
"ios-universal"
],
macos.yaml: [
diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml
index 130c974f..f7889230 100644
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -2,7 +2,7 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index cba14bb7..92746561 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,13 +1,13 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Configure arguments: '-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_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml
index c6e10e45..2c9f5efd 100644
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions']
diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml
index 6644d197..83848148 100644
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -7,8 +7,8 @@ Configurations:
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
- Id: 'Windows10_21H2-Mingw11-x64-host'
- Template: 'qtci-windows-10_21H2-x86_64-51'
+ Id: 'Windows10_22H2-Mingw11-x64-host'
+ Template: 'qtci-windows-10_22H2-x86_64-50'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'