diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-12-07 15:52:05 +0200 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-12-22 11:19:23 +0200 |
commit | b338b8a9bec0aaba3ef2cd8a75bfec8813443157 (patch) | |
tree | 8f1e484f075eedd395ac3e617bfbcaa07b09d972 /coin/platform_configs | |
parent | 18b13306ce01112714f0ca65bce946509058a42d (diff) |
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 <oliver.wolff@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 64 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_target_android_host_windows.yaml | 47 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_wasm.yaml | 13 | ||||
-rw-r--r-- | coin/platform_configs/flashing-wizard.yaml | 11 | ||||
-rw-r--r-- | coin/platform_configs/qdb.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/qt-creator.yaml | 7 | ||||
-rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 19 |
8 files changed, 177 insertions, 0 deletions
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 @@ -82,12 +82,35 @@ Configurations: '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' Target arch: 'arm64' @@ -121,6 +144,20 @@ Configurations: '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' Compiler: 'GCC' @@ -154,6 +191,17 @@ Configurations: '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' Compiler: 'Clang' @@ -170,6 +218,14 @@ 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'] - + 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' Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] @@ -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}}'] diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index ffb36664..f071002c 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -14,6 +14,14 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2019' + Features: ['Sccache', 'MinimalStaticTests'] + Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: [ + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' + ] +- Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests'] 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 c58ed04b..2a387423 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -12,6 +12,17 @@ Configurations: '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', ] + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + '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', + ] - Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' @@ -25,6 +36,18 @@ Configurations: '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', ] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + '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', + ] +- Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'x86' @@ -37,6 +60,18 @@ Configurations: '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', ] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + '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', + ] +- Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -48,3 +83,15 @@ Configurations: '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', ] +- + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + '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', + ] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index c977c83e..eeb84c7b 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -24,6 +24,19 @@ Configurations: '-DFEATURE_pkg_config=OFF' ] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'WebAssembly' + Compiler: 'Mingw' + Target compiler: 'Clang' + Platform dependency: 'Windows10_21H2-Mingw11-x64-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + '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', + '-DFEATURE_pkg_config=OFF' + ] +- Template: 'qtci-macos-10.14-x86_64' Target os: 'WebAssembly' Compiler: 'Clang' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 4d3f0340..ceac201f 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -7,12 +7,23 @@ 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' + 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' + - Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' 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' + Compiler: 'MSVC2019' + Target arch: 'x86' + 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-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 28ac01f7..b7b20402 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -9,6 +9,14 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2019' + Features: ['Packaging', 'Sccache', 'MinimalStaticTests'] + Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: [ + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' + ] +- Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 56b47ba9..ee2ec32e 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -9,6 +9,13 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'MSVC2019' + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] + Configure arguments: '' + Environment variables: [] + Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] +- Template: 'qtci-windows-10-x86-4' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index df9f96ef..9cfa2c2a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -7,18 +7,37 @@ Configurations: 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_21H2-x86_64-51' + Compiler: 'Mingw' + 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'] 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_21H2-x86_64-51' + Compiler: 'Mingw' + Environment variables: ['PATH=C:\MINGW810\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-x86_64-52' Compiler: 'Mingw' 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_21H2-x86_64-51' + Compiler: 'Mingw' + 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-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] |