diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 52ceb847..c39d3156 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -191,25 +191,6 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] -- - Id: 'windows-11_24H2-msvc2022-arm64' - Template: 'qtci-windows-11_24H2-x86_64-71' - Compiler: 'MSVC2022' - Target arch: 'arm64' - Features: ['Sccache', '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 -no-feature-run-opengl-tests', - 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON', - '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}}', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', - ] - Id: 'windows-11_24H2-msvc2022-arm64-23H2' Template: 'qtci-windows-11_24H2-x86_64-71' @@ -231,13 +212,6 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] -- - Id: 'windows-11-x86_64-arm64-tests' - Template: 'qtci-windows-11_22H2-aarch64-55' - Compiler: 'MSVC2022' - Features: ['TestOnly'] - Configure arguments: '-no-opengl -cross-compiled' - Platform dependency: 'windows-11_24H2-msvc2022-arm64' - Id: 'windows-11-x86_64-arm64-tests-23H2' Template: 'qtci-windows-11_23H2-aarch64-53' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 30dc792f..5c5b217c 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -59,17 +59,6 @@ Configurations: 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] -- - Id: 'Windows-MSVC2022-arm64_Static' - Template: 'qtci-windows-11_22H2-aarch64-54' - Compiler: 'MSVC2022' - Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests'] - Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl' - 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', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] - Id: 'Windows-MSVC2022-arm64_Static-23H2' Template: 'qtci-windows-11_23H2-aarch64-53'