From 39bdb1e33272c7f9b94d879b44cc23ae6395f036 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:06:48 -0500 Subject: gitlab-ci: Re-organize Windows job tags Name the tag groups based on the VS version needed, if any. Drop VS-related tags from Windows jobs that do not need any pre-installed VS version. --- .gitlab-ci.yml | 14 +++++++------- .gitlab/os-windows.yml | 11 +++++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dc9dcf..10d908a 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: @@ -759,7 +759,7 @@ 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: @@ -773,7 +773,7 @@ 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: @@ -787,7 +787,7 @@ 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: @@ -801,7 +801,7 @@ 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: diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 7e12496..dc470f7 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -104,7 +104,7 @@ ## Tags -.windows_builder_tags: +.windows_tags_nonconcurrent_vs2019: tags: - cmake # Since this is a bare runner, pin to a project. - windows @@ -113,7 +113,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 @@ -122,6 +122,13 @@ - msvc-19.29-16.11 - concurrent +.windows_tags_concurrent: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - concurrent + ## Windows-specific scripts .before_script_windows: &before_script_windows -- cgit v0.12 From ac32794983dbd84f6e0ed6c8a92268f58b3fed88 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:06:48 -0500 Subject: 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 708d80a..e828475 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 8037b33..91d62ac 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 -- cgit v0.12 From 190d2b5d556a7c90be975ff39993d0bcfb6bf9dc Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:11:17 -0500 Subject: gitlab-ci: Update Windows jobs to VS 2022 --- .gitlab-ci.yml | 26 ++++++++++---------- .gitlab/ci/configure_windows_vs2019_x64.cmake | 3 --- .../ci/configure_windows_vs2019_x64_ninja.cmake | 7 ------ .gitlab/ci/configure_windows_vs2022_x64.cmake | 3 +++ .../ci/configure_windows_vs2022_x64_ninja.cmake | 7 ++++++ .gitlab/ci/download_qt.cmake | 3 ++- .gitlab/os-windows.yml | 28 +++++++++++----------- 7 files changed, 39 insertions(+), 38 deletions(-) delete mode 100644 .gitlab/ci/configure_windows_vs2019_x64.cmake delete mode 100644 .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake create mode 100644 .gitlab/ci/configure_windows_vs2022_x64.cmake create mode 100644 .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e828475..79e970b 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_vs2019_x64.cmake deleted file mode 100644 index f6ece57..0000000 --- a/.gitlab/ci/configure_windows_vs2019_x64.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake deleted file mode 100644 index e1ae81e..0000000 --- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") -set(CMake_TEST_GUI "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake new file mode 100644 index 0000000..f6ece57 --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake new file mode 100644 index 0000000..e1ae81e --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -0,0 +1,7 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 3990430..5940a28 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 91d62ac..a119433 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 -- cgit v0.12 From b63a87582f7fa936881e13407a106700eb20d2de Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 11 Nov 2021 12:11:17 -0500 Subject: gitlab-ci: Update Windows jobs to VS 2022 --- .gitlab-ci.yml | 42 +++++++++++----------- .gitlab/ci/configure_windows_vs2019_x64.cmake | 3 -- .../ci/configure_windows_vs2019_x64_ninja.cmake | 7 ---- .gitlab/ci/configure_windows_vs2022_x64.cmake | 3 ++ .../ci/configure_windows_vs2022_x64_ninja.cmake | 7 ++++ .gitlab/ci/download_qt.cmake | 3 +- .gitlab/os-windows.yml | 28 +++++++-------- 7 files changed, 47 insertions(+), 46 deletions(-) delete mode 100644 .gitlab/ci/configure_windows_vs2019_x64.cmake delete mode 100644 .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake create mode 100644 .gitlab/ci/configure_windows_vs2022_x64.cmake create mode 100644 .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10d908a..d4b7c5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -723,37 +723,37 @@ 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_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 test:windows-borland5.5: extends: @@ -763,9 +763,9 @@ test:windows-borland5.5: - .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" @@ -777,9 +777,9 @@ test:windows-borland5.8: - .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" @@ -791,9 +791,9 @@ test:windows-msvc-v71-nmake: - .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" @@ -805,8 +805,8 @@ test:windows-openwatcom1.9: - .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" diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake deleted file mode 100644 index f6ece57..0000000 --- a/.gitlab/ci/configure_windows_vs2019_x64.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake deleted file mode 100644 index e1ae81e..0000000 --- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake +++ /dev/null @@ -1,7 +0,0 @@ -set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") -set(CMake_TEST_GUI "ON" CACHE BOOL "") -set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") -set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake new file mode 100644 index 0000000..f6ece57 --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake new file mode 100644 index 0000000..e1ae81e --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake @@ -0,0 +1,7 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") +set(CMake_TEST_GUI "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") +set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 3990430..5940a28 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 dc470f7..f781c56 100644 --- a/.gitlab/os-windows.yml +++ b/.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,22 @@ ## 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_tags_concurrent: -- cgit v0.12