diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-10-03 12:21:27 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-12-23 06:35:16 +0000 |
| commit | 6e41cc70a09257b4d2dd0c9464cd025e8923775c (patch) | |
| tree | f23b5e769d5b198061b36e3961ae1d061930ad99 /coin/platform_configs | |
| parent | 04a8c2fe49c52ee9e2d69d5a0544a4d88431c9fc (diff) | |
Add Windows 11 22H2 to CI
Windows 11 21H2 will be replaced by 22H2 version
Task-number: QTQAINFRA-5203
Change-Id: Iad18055cf84d9c1ff38984611c820b1c23d663a2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 3d05c6774930d882c173c79c677687fabe33b973)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b1a75217..3f257a76 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -51,7 +51,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64'] - - Template: 'qtci-windows-11_21H2-x86_64-52' + Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -69,7 +69,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-52' + Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -105,8 +105,8 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}' ] - - Id: 'Windows11_21H2-MSVC2019-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-52' + Id: 'Windows11_22H2-MSVC2019-x64-host' + Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' @@ -115,11 +115,11 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-52' + Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] - Platform dependency: 'Windows11_21H2-MSVC2019-x64-host' + Platform dependency: 'Windows11_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', @@ -176,8 +176,8 @@ Configurations: 'LLVM_INSTALL_DIR=C:\llvm-mingw' ] - - Id: 'Windows11_21H2-LLVM-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-52' + Id: 'Windows11_22H2-LLVM-x64-host' + Template: 'qtci-windows-11_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' @@ -199,7 +199,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-52' + Template: 'qtci-windows-11_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' |