From 0148e13038f7de915192604a0b30e8b8b2aaacc1 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 10 Dec 2024 14:35:38 +0200 Subject: [PATCH] Windows 11 23h2: Install Windows SDK 10.0.26100.1742 Change Windows 11 23h2 x86_64 tier-1 template -53 -> -54, where Windows SDK 10.0.26100.1742 is installed. Task-number: QTQAINFRA-6862 Task-number: COIN-1206 Pick-to: 6.8 Change-Id: I713ea4d5032145a92d7bcbccec6c98543cbc90d2 Reviewed-by: Michal Klocek (cherry picked from commit 4bfe8b9d71296143eb26c1ab08ef986b1a1a527b) Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 10 +++++----- .../cmake_platforms_static_release.yaml | 2 +- .../platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/nightly_unity_builds.yaml | 2 +- .../qtci-windows-11_23H2-x86_64/msvc2022.txt | 4 ++++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0332dcae..615f5924 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -152,7 +152,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -175,7 +175,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-arm64' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] @@ -191,7 +191,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' @@ -249,7 +249,7 @@ Configurations: ] - Id: 'windows-11_23H2-llvm' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Clang' Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' @@ -262,7 +262,7 @@ Configurations: ] - Id: 'windows-11_23H2-mingw13-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Mingw' Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 6bd5f994..fc7b2952 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -3,7 +3,7 @@ Configurations: - Id: 'windows-11_23H2-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests'] Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 25bed53e..833fb436 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -20,7 +20,7 @@ Configurations: ] - Id: 'windows-11_23H2-minimal-static' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 73bb0b13..b8cfc5f9 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'windows-11_23H2-msvc2022-unity-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib' diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt index a5a0c412..2a130966 100644 --- a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt @@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0) Windows 11 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################