From 38fe4599c78c1bd6bb1345fc8d8989fd8c3b21eb Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 6 May 2025 22:31:25 +0300 Subject: [PATCH] Remove Windows 11 23H2 x86_64 from CI 23H2 is replaced by 24H2. [CI Platforms] Pick-to: 6.10 Task-number: QTQAINFRA-6734 Change-Id: Ib136f46a6725aeb929d7bd406fbb31a290f71e58 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 79 +------------------ .../cmake_platforms_static_release.yaml | 14 ---- .../cmake_platforms_static_tests.yaml | 14 ---- .../nightly_unity_builds.yaml | 12 --- coin/platform_configs/nightly_windows.yaml | 12 +-- coin/platform_configs/precheck.yaml | 1 - coin/platform_configs/qt-creator.yaml | 21 ----- coin/platform_configs/qtgradleplugin.yaml | 5 -- .../qtsaferenderer-runtime.yaml | 3 - coin/platform_configs/qtsaferenderer.yaml | 3 - 10 files changed, 8 insertions(+), 156 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 60dcb657..3d3a9928 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -170,21 +170,6 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] -- - Id: 'windows-11_23H2-msvc2022' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' - Environment variables: [ - 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=x64-windows-qt', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', - ] - Id: 'windows-11_24H2-msvc2022' Template: 'qtci-windows-11_24H2-x86_64-71' @@ -214,32 +199,12 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}', ] -- - Id: 'windows-11_23H2-msvc2022-arm64' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Target arch: 'arm64' - Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'Packaging', '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}}', - '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}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', - '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', 'Packaging', 'DisableTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -260,21 +225,7 @@ Configurations: Compiler: 'MSVC2022' Features: ['TestOnly'] Configure arguments: '-no-opengl -cross-compiled' - Platform dependency: 'windows-11_23H2-msvc2022-arm64' -- - Id: 'windows-11_23H2-msvc2022-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['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' - Environment variables: [ - 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=x64-windows-qt', - 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', - ] + Platform dependency: 'windows-11_24H2-msvc2022-arm64' - Id: 'windows-11_24H2-msvc2022-developer-build' Template: 'qtci-windows-11_24H2-x86_64-71' @@ -351,19 +302,6 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] -- - Id: 'windows-11_23H2-llvm' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'Clang' - Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' - Environment variables: [ - 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', - ] - Id: 'windows-11_24H2-llvm' Template: 'qtci-windows-11_24H2-x86_64-71' @@ -377,19 +315,6 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', ] -- - Id: 'windows-11_23H2-mingw13-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'Mingw' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] - Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', - ] - Id: 'windows-11_24H2-mingw13-developer-build' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index ab2227e9..730e1888 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -1,20 +1,6 @@ Version: 2 Configurations: -- - Id: 'windows-11_23H2-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_23H2-x86_64-55' - 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' - Environment variables: [ - 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=x64-windows-qt', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] - Id: 'windows-11_24H2-msvc2022-minimal-static-test' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 8c88de2d..f97e8acc 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -11,20 +11,6 @@ Configurations: 'VCPKG_HOST_TRIPLET=x64-linux-qt', 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] -- - Id: 'windows-11_23H2-minimal-static' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['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' - Environment variables: [ - 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'VCPKG_HOST_TRIPLET=x64-windows-qt', - 'VCPKG_TARGET_TRIPLET=x64-windows-qt', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', - ] - Id: 'windows-11_24H2-minimal-static' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 3d35bae0..178b891a 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -1,17 +1,5 @@ Version: 2 Configurations: -- - Id: 'windows-11_23H2-msvc2022-unity-build' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests'] - Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib' - Environment variables: [ - 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] - Id: 'windows-11_24H2-msvc2022-unity-build' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/nightly_windows.yaml b/coin/platform_configs/nightly_windows.yaml index 80eee42f..f5d9386b 100644 --- a/coin/platform_configs/nightly_windows.yaml +++ b/coin/platform_configs/nightly_windows.yaml @@ -2,20 +2,20 @@ Version: 2 Configurations: [] Include: [ cmake_platforms.yaml: [ - 'windows-11_23H2-msvc2022-developer-build', - 'windows-11_23H2-mingw13-developer-build', - 'windows-11_23H2-llvm' + 'windows-11_24H2-msvc2022-developer-build', + 'windows-11_24H2-mingw13-developer-build', + 'windows-11_24H2-llvm' ] ] # Windows nightly to check for -qtnamespace errors/issues Overrides: - - Id: 'windows-11_23H2-msvc2022-developer-build' + Id: 'windows-11_24H2-msvc2022-developer-build' Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' - - Id: 'windows-11_23H2-mingw13-developer-build' + Id: 'windows-11_24H2-mingw13-developer-build' Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' - - Id: 'windows-11_23H2-llvm' + Id: 'windows-11_24H2-llvm' Features: ['Sccache', 'UseConfigure'] Configure arguments: '-qtnamespace TestNamespace -release -force-debug-info -separate-debug-info -nomake examples' diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index 0f4bfabb..dbd7f25b 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -5,7 +5,6 @@ Include: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", "ubuntu-22.04-developer-build-x11-tests", - "windows-11_23H2-msvc2022-developer-build", "windows-11_24H2-msvc2022-developer-build", "ios-universal" ], diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 726892cd..4faf7cf5 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -1,13 +1,6 @@ Version: 2 Module only: True Configurations: -- - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease'] - Configure arguments: '' - Environment variables: [] - Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' @@ -34,13 +27,6 @@ Configurations: Configure arguments: '' Environment variables: [] # without tests -- - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] - Configure arguments: '' - Environment variables: [] - Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' @@ -49,13 +35,6 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] # oldest Qt version -- - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] - Configure arguments: '' - Environment variables: [] - Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-11_24H2-x86_64-71' Compiler: 'MSVC2022' diff --git a/coin/platform_configs/qtgradleplugin.yaml b/coin/platform_configs/qtgradleplugin.yaml index 1305e41b..6aa269ea 100644 --- a/coin/platform_configs/qtgradleplugin.yaml +++ b/coin/platform_configs/qtgradleplugin.yaml @@ -11,11 +11,6 @@ Configurations: Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['TestOnly'] -- - Id: 'qtgp-on-windows' - Template: 'qtci-windows-11_23H2-x86_64-55' - Compiler: 'MSVC2022' - Features: ['TestOnly'] - Id: 'qtgp-on-windows-24h2' Template: 'qtci-windows-11_24H2-x86_64-71' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index e1c04eb6..2fb5e0cb 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -13,9 +13,6 @@ Include: [ "windows-10_22h2-msvc2022", "rhel-8.10", "windows-10_22h2-mingw13", - "windows-11_23H2-mingw13-developer-build", - "windows-11_23H2-llvm", - "windows-11_23H2-msvc2022", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", "windows-11_24H2-msvc2022", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 4ea61e21..548b75b9 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -14,9 +14,6 @@ Include: [ "windows-10_22h2-msvc2022", "rhel-8.10", "windows-10_22h2-mingw13", - "windows-11_23H2-mingw13-developer-build", - "windows-11_23H2-llvm", - "windows-11_23H2-msvc2022", "windows-11_24H2-mingw13-developer-build", "windows-11_24H2-llvm", "windows-11_24H2-msvc2022",