From ac32794983dbd84f6e0ed6c8a92268f58b3fed88 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:06:48 -0500 Subject: [PATCH 1/2] gitlab-ci: Re-organize Windows job tags Name the tag groups based on the VS version needed. --- .gitlab-ci.yml | 6 +++--- .gitlab/os-windows.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 708d80ae8f..e828475928 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -728,14 +728,14 @@ build:windows-vs2019-x64-ninja: - .windows_vs2019_x64_ninja - .cmake_build_windows - .cmake_build_artifacts - - .windows_builder_tags + - .windows_tags_nonconcurrent_vs2019 - .run_manually test:windows-vs2019-x64-ninja: extends: - .windows_vs2019_x64_ninja - .cmake_test_windows - - .windows_builder_tags + - .windows_tags_nonconcurrent_vs2019 - .cmake_test_artifacts - .run_dependent dependencies: @@ -747,7 +747,7 @@ test:windows-vs2019-x64: extends: - .windows_vs2019_x64 - .cmake_test_windows_external - - .windows_builder_ext_tags + - .windows_tags_concurrent_vs2019 - .cmake_junit_artifacts - .run_dependent dependencies: diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 8037b33f5b..91d62ac648 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -54,7 +54,7 @@ ## Tags -.windows_builder_tags: +.windows_tags_nonconcurrent_vs2019: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -63,7 +63,7 @@ - msvc-19.29-16.11 - nonconcurrent -.windows_builder_ext_tags: +.windows_tags_concurrent_vs2019: tags: - cmake # Since this is a bare runner, pin to a project. - windows From 190d2b5d556a7c90be975ff39993d0bcfb6bf9dc Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:11:17 -0500 Subject: [PATCH 2/2] gitlab-ci: Update Windows jobs to VS 2022 --- .gitlab-ci.yml | 26 ++++++++--------- ...ake => configure_windows_vs2022_x64.cmake} | 0 ... configure_windows_vs2022_x64_ninja.cmake} | 0 .gitlab/ci/download_qt.cmake | 3 +- .gitlab/os-windows.yml | 28 +++++++++---------- 5 files changed, 29 insertions(+), 28 deletions(-) rename .gitlab/ci/{configure_windows_vs2019_x64.cmake => configure_windows_vs2022_x64.cmake} (100%) rename .gitlab/ci/{configure_windows_vs2019_x64_ninja.cmake => configure_windows_vs2022_x64_ninja.cmake} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e828475928..79e970ba20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -723,34 +723,34 @@ build: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_tags_nonconcurrent_vs2019 + - .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_tags_nonconcurrent_vs2019 + - .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_tags_concurrent_vs2019 + - .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 diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake similarity index 100% rename from .gitlab/ci/configure_windows_vs2019_x64.cmake rename to .gitlab/ci/configure_windows_vs2022_x64.cmake diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake similarity index 100% rename from .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake rename to .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 3990430135..5940a285e7 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.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") diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 91d62ac648..a1194331bf 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -31,45 +31,45 @@ 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" ## Tags -.windows_tags_nonconcurrent_vs2019: +.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_tags_concurrent_vs2019: +.windows_tags_concurrent_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 - concurrent ## Windows-specific scripts