Remove Windows 11 22H2 targets from CI

22H2 is replaced by Windows 11 23H2.

Task-number: QTQAINFRA-6113
Task-number: QTQAINFRA-6075
Change-Id: Ifd960a4c18b19f91a2624a23eacffa59c2faefac
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>

3 files changed, 2 insertions, 77 deletions

diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 5d31478a..1ed9d620 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -72,18 +72,6 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_22h2-msvc2019'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
-    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_native_grpc=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
     Id: 'windows-11_23H2-msvc2019'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'MSVC2019'
@@ -108,18 +96,6 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_22h2-msvc2022'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20'
-    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_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
     Id: 'windows-11_23H2-msvc2022'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'MSVC2022'
@@ -160,18 +136,6 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_22h2-msvc2019-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-    ]
--
     Id: 'windows-11_23H2-msvc2019-developer-build'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'MSVC2019'
@@ -184,19 +148,6 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_22h2-msvc2019-arm64'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
     Id: 'windows-11_23H2-msvc2019-arm64'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'MSVC2019'
@@ -290,19 +241,6 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
 -
-    Id: 'windows-11_22h2-llvm'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'Clang'
-    Features: ['Packaging','Sccache', 'UseConfigure']
-    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=C:\llvm-mingw',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
-    ]
--
     Id: 'windows-11_23H2-llvm'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'Clang'
@@ -329,19 +267,6 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
 -
-    Id: 'windows-11_22h2-mingw13-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-52'
-    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -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',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
-    ]
--
     Id: 'windows-11_23H2-mingw13-developer-build'
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'Mingw'
diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml
index 0e72301c..c413e5cb 100644
--- a/coin/platform_configs/qtsaferenderer-runtime.yaml
+++ b/coin/platform_configs/qtsaferenderer-runtime.yaml
@@ -17,7 +17,7 @@ Include: [
     "windows-10_22h2-mingw13",
     "windows-10_22h2-mingw13-developer-build",
     "windows-10_22h2-llvm",
-    "windows-11_22h2-msvc2019"
+    "windows-11_23H2-msvc2019"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 29f79618..ec0d6832 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -15,7 +15,7 @@ Include: [
     "rhel-8.8",
     "windows-10_22h2-mingw13",
     "windows-10_22h2-llvm",
-    "windows-11_22h2-msvc2019"
+    "windows-11_23H2-msvc2019"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",