Merge topic 'ci-vs2022'

0e6bdb90e5 Merge branch 'backport-3.22-ci-vs2022' into ci-vs2022
b63a87582f gitlab-ci: Update Windows jobs to VS 2022
190d2b5d55 gitlab-ci: Update Windows jobs to VS 2022
ac32794983 gitlab-ci: Re-organize Windows job tags
39bdb1e332 gitlab-ci: Re-organize Windows job tags

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6724

.gitlab-ci.yml

@@ -723,49 +723,49 @@ upload:macos10.10-package:
 
 # Windows builds
 
-build:windows-vs2019-x64-ninja:
+build:windows-vs2022-x64-ninja:
     extends:
-        - .windows_vs2019_x64_ninja
+        - .windows_vs2022_x64_ninja
         - .cmake_build_windows
         - .cmake_build_artifacts
-        - .windows_builder_tags
+        - .windows_tags_nonconcurrent_vs2022
         - .run_manually
 
-test:windows-vs2019-x64-ninja:
+test:windows-vs2022-x64-ninja:
     extends:
-        - .windows_vs2019_x64_ninja
+        - .windows_vs2022_x64_ninja
         - .cmake_test_windows
-        - .windows_builder_tags
+        - .windows_tags_nonconcurrent_vs2022
         - .cmake_test_artifacts
         - .run_dependent
     dependencies:
-        - build:windows-vs2019-x64-ninja
+        - build:windows-vs2022-x64-ninja
     needs:
-        - build:windows-vs2019-x64-ninja
+        - build:windows-vs2022-x64-ninja
 
-test:windows-vs2019-x64:
+test:windows-vs2022-x64:
     extends:
-        - .windows_vs2019_x64
+        - .windows_vs2022_x64
         - .cmake_test_windows_external
-        - .windows_builder_ext_tags
+        - .windows_tags_concurrent_vs2022
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
 
 test:windows-borland5.5:
     extends:
         - .windows_borland5.5
         - .cmake_test_windows_borland
-        - .windows_builder_ext_tags
+        - .windows_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
@@ -773,13 +773,13 @@ test:windows-borland5.8:
     extends:
         - .windows_borland5.8
         - .cmake_test_windows_borland
-        - .windows_builder_ext_tags
+        - .windows_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
@@ -787,13 +787,13 @@ test:windows-msvc-v71-nmake:
     extends:
         - .windows_msvc_v71_nmake
         - .cmake_test_windows_nmake
-        - .windows_builder_ext_tags
+        - .windows_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
@@ -801,12 +801,12 @@ test:windows-openwatcom1.9:
     extends:
         - .windows_openwatcom1.9
         - .cmake_test_windows_openwatcom
-        - .windows_builder_ext_tags
+        - .windows_tags_concurrent
         - .cmake_junit_artifacts
         - .run_dependent
     dependencies:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     needs:
-        - test:windows-vs2019-x64-ninja
+        - test:windows-vs2022-x64-ninja
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"

.gitlab/ci/download_qt.cmake

@@ -18,7 +18,8 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows")
     set(msvc_year "2015")
     set(qt_abi "win64_msvc${msvc_year}_64")
   elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR
-          "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019")
+          "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR
+          "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022")
     set(qt_platform "windows_x86")
     set(msvc_year "2019")
     set(qt_abi "win64_msvc${msvc_year}_64")

.gitlab/os-windows.yml

@@ -31,25 +31,25 @@
         CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
 
-.windows_vs2019_x64_ninja:
+.windows_vs2022_x64_ninja:
     extends: .windows_ninja
 
     variables:
-        CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
-        VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+        CMAKE_CONFIGURATION: windows_vs2022_x64_ninja
+        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.29.30133"
+        VCVARSVERSION: "14.30.30705"
 
 ### External testing
 
-.windows_vs2019_x64:
+.windows_vs2022_x64:
     extends: .windows
 
     variables:
-        CMAKE_CONFIGURATION: windows_vs2019_x64
-        CMAKE_GENERATOR: "Visual Studio 16 2019"
+        CMAKE_CONFIGURATION: windows_vs2022_x64
+        CMAKE_GENERATOR: "Visual Studio 17 2022"
         CMAKE_GENERATOR_PLATFORM: "x64"
-        CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30133"
+        CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 .windows_borland:
@@ -104,22 +104,29 @@
 
 ## Tags
 
-.windows_builder_tags:
+.windows_tags_nonconcurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
         - windows
         - shell
-        - vs2019
-        - msvc-19.29-16.11
+        - vs2022
+        - msvc-19.30
         - nonconcurrent
 
-.windows_builder_ext_tags:
+.windows_tags_concurrent_vs2022:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows
+        - shell
+        - vs2022
+        - msvc-19.30
+        - concurrent
+
+.windows_tags_concurrent:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
         - windows
         - shell
-        - vs2019
-        - msvc-19.29-16.11
         - concurrent
 
 ## Windows-specific scripts