From bd0ad72d4cce078c72b05e29e7d826e89f063d3d Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Mon, 22 Sep 2025 13:32:30 +0300 Subject: [PATCH] Windows ARM: Rename WoA 11 23h2 IDs by removing extra -23H2 Pick-to: 6.10 Change-Id: I53f3f44eab9a26cb75683b89e7d6984c305a5c10 Reviewed-by: Teemu Holappa --- coin/platform_configs/cmake_platforms.yaml | 6 +++--- coin/platform_configs/qtsaferenderer.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e3b87163..24bd88c6 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -200,7 +200,7 @@ Configurations: 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] - - Id: 'windows-11_24H2-msvc2022-arm64-23H2' + Id: 'windows-11_24H2-msvc2022-arm64' Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' Target arch: 'arm64' @@ -221,12 +221,12 @@ Configurations: 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] - - Id: 'windows-11-x86_64-arm64-tests-23H2' + Id: 'windows-11-x86_64-arm64-tests' Template: 'qtci-windows-11_23H2-aarch64-53' Compiler: 'MSVC2022' Features: ['TestOnly'] Configure arguments: '-cross-compiled' - Platform dependency: 'windows-11_24H2-msvc2022-arm64-23H2' + Platform dependency: 'windows-11_24H2-msvc2022-arm64' - Id: 'windows-11_24H2-msvc2022-developer-build' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index d0ba0137..5c36ac0c 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -60,7 +60,7 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] - - Id: 'Windows-MSVC2022-arm64_Static-23H2' + Id: 'Windows-MSVC2022-arm64_Static' Template: 'qtci-windows-11_23H2-aarch64-53' Compiler: 'MSVC2022' Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']