From acb1eb656a140079a29c068596593b51e267d762 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 21 Aug 2025 11:18:21 +0300 Subject: [PATCH] Add missing static targets to Windows on ARM 11 23h2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Targets - windows-11_23h2-arm64-msvc2022-minimal-static-test - Windows-MSVC2022-arm64_Static-23H2 Task-number: QTQAINFRA-7273 Task-number: QTQAINFRA-6973 Pick-to: 6.10 6.9 Change-Id: I1e2110973d0ad0645c1f5b62c420655c94235eab Reviewed-by: Samuli Piippo Reviewed-by: Simo Fält --- .../cmake_platforms_static_release.yaml | 13 +++++++++++++ coin/platform_configs/qtsaferenderer.yaml | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 730e1888..3641872f 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -28,6 +28,19 @@ Configurations: 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests'] + Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', + 'VCPKG_HOST_TRIPLET=arm64-windows-qt', + 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'rhel-8.10-minimal-static-test' Template: 'qtci-linux-RHEL-8.10-x86_64-51' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 3c2dbc39..e4521bee 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -70,6 +70,17 @@ Configurations: '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' + 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_Static' Template: 'qtci-windows-10_22H2-x86_64-53'