From b338b8a9bec0aaba3ef2cd8a75bfec8813443157 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 7 Dec 2021 15:52:05 +0200 Subject: Add Windows 10 21H2 to 6.2 branch 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 Change-Id: Ib0160acaf4a560cf399dc4427c1495724900d0bf Reviewed-by: Oliver Wolff --- coin/platform_configs/cmake_platforms.yaml | 64 ++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'coin/platform_configs/cmake_platforms.yaml') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 47561e5a..fee292dd 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -81,12 +81,35 @@ 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_21H2-x86_64-51' + Compiler: 'MSVC2019' + Features: ['Packaging', 'Sccache', "DebugAndRelease"] + 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}}\..' + Environment variables: [ + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64' + ] +- + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2022' + Features: ['Sccache', "DebugAndRelease"] + 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}}\..' + Environment variables: [ + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' + ] - Id: 'Windows10-MSVC2019-x64-host' Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease"] 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' +- + Id: 'Windows10_21H2-MSVC2019-x64-host' + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2019' + Features: ['Sccache', "DebugAndRelease"] + 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-x86_64-52' Compiler: 'MSVC2019' @@ -120,6 +143,20 @@ Configurations: '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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2019' + Target arch: 'arm64' + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] + 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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64', + 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64' + ] - Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -153,6 +190,17 @@ Configurations: 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] +- + 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}}\..' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] - Id: 'Windows10-LLVM-x64-host' Template: 'qtci-windows-10-x86_64-52' @@ -169,6 +217,14 @@ Configurations: 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' 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'] +- + 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}}\..' + Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR=C:\llvm-mingw'] - Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' @@ -185,3 +241,11 @@ Configurations: 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' Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] +- + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'Mingw' + 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' + Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] -- cgit v1.2.3