diff options
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 2af72f56d..40917561d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -154,8 +154,8 @@ Configurations: Id: 'windows-11_23h2-arm64-msvc2022' Template: 'qtci-windows-11_23H2-aarch64-53' Compiler: 'MSVC2022' - Features: ['DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -180,6 +180,23 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - + Id: 'windows-11_23H2-msvc2022-arm64-23H2' + Template: 'qtci-windows-11_23H2-x86_64-54' + Compiler: 'MSVC2022' + Target arch: 'arm64' + Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Platform dependency: 'windows-10_22h2-mingw13' + Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] +- Id: 'windows-11-x86_64-arm64-tests' Template: 'qtci-windows-11_22H2-aarch64-55' Compiler: 'MSVC2022' @@ -187,6 +204,13 @@ Configurations: Configure arguments: '-no-opengl -cross-compiled' Platform dependency: 'windows-11_23H2-msvc2022-arm64' - + Id: 'windows-11-x86_64-arm64-tests-23H2' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-cross-compiled' + Platform dependency: 'windows-11_23H2-msvc2022-arm64-23H2' +- Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' |