lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace Windows 10 21H1 with Windows 10 21H2 in CI

Browse Source 
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25420.1 Update 3
Visual Studio 2019 + build tools version 16.11.7
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4651
Pick-to: 6.2
Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2021-11-26 09:31:15 +02:00
parent 19fbf58013
commit 4eaaaa7c7c
97 changed files with 614 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
coin/platform_configs/cmake_platforms.yaml
View File

@@ -62,7 +62,7 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", "Insignificant"]
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
@@ -78,7 +78,7 @@ Configurations:
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2022_PREVIEW'
Features: ['Sccache', "DebugAndRelease", 'Insignificant']
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
@@ -115,17 +115,17 @@ Configurations:
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
-
Id: 'Windows10_21H1-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H1-x86_64-52'
Id: 'Windows10_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", "Insignificant"]
Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant']
Platform dependency: 'Windows10_21H1-MSVC2019-x64-host'
Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON',
]
@@ -188,8 +188,8 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
-
Id: 'Windows10_21H1-Mingw11-x64-host'
Template: 'qtci-windows-10_21H1-x86_64-52'
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
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 -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
@@ -206,8 +206,8 @@ Configurations:
Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
Id: 'Windows10_21H1-LLVM-x64-host'
Template: 'qtci-windows-10_21H1-x86_64-52'
Id: 'Windows10_21H2-LLVM-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Clang'
Features: ['Sccache']
Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_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 -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
@@ -222,7 +222,7 @@ Configurations:
Environment variables: ['Path=C:\llvm-mingw\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=C:\llvm-mingw']
-
Template: 'qtci-windows-10_21H1-x86_64-52'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
Features: ['Sccache']