From cb8b27a9011c56496e4fd86ffeb60de2a6d74ddf Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 18 Aug 2022 09:40:02 -0400 Subject: gitlab-ci: Use separate MSVC toolset specification for packaging jobs This will be useful for testing CMake with one version of MSVC while packaging the official binaries with another version. Issue: #23859 --- .gitlab-ci.yml | 12 ++++++------ .gitlab/os-windows.yml | 47 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f26508..65bcd5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1032,7 +1032,7 @@ b:windows-x86_64-package: - .windows_x86_64_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_nonconcurrent_vs2022 + - .windows_tags_x86_64_package - .run_only_for_package dependencies: - p:doc-package @@ -1046,7 +1046,7 @@ k:windows-x86_64-package: - .windows_x86_64_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_nonconcurrent_vs2022 + - .windows_tags_x86_64_package - .run_only_for_package dependencies: - b:windows-x86_64-package @@ -1069,7 +1069,7 @@ b:windows-i386-package: - .windows_i386_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_nonconcurrent_vs2022 + - .windows_tags_x86_64_package - .run_only_for_package dependencies: - p:doc-package @@ -1083,7 +1083,7 @@ k:windows-i386-package: - .windows_i386_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_nonconcurrent_vs2022 + - .windows_tags_x86_64_package - .run_only_for_package dependencies: - b:windows-i386-package @@ -1106,7 +1106,7 @@ b:windows-arm64-package: - .windows_arm64_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_nonconcurrent_vs2022_arm64 + - .windows_tags_arm64_package - .run_only_for_package dependencies: - p:doc-package @@ -1120,7 +1120,7 @@ k:windows-arm64-package: - .windows_arm64_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_nonconcurrent_vs2022_arm64 + - .windows_tags_arm64_package - .run_only_for_package dependencies: - b:windows-arm64-package diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index b9b91fb..e693dcb 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -43,7 +43,19 @@ VCVARSPLATFORM: "x86" VCVARSVERSION: "14.32.31326" -.windows_vcvarsall_vs2022_x64_arm64: +.windows_vcvarsall_vs2022_x64_package: + variables: + VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" + VCVARSPLATFORM: "x64" + VCVARSVERSION: "14.32.31326" + +.windows_vcvarsall_vs2022_x86_package: + variables: + VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" + VCVARSPLATFORM: "x86" + VCVARSVERSION: "14.32.31326" + +.windows_vcvarsall_vs2022_x64_arm64_package: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64_arm64" @@ -68,7 +80,7 @@ .windows_x86_64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64 + - .windows_vcvarsall_vs2022_x64_package variables: CMAKE_CONFIGURATION: windows_x86_64_package @@ -76,7 +88,7 @@ .windows_i386_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x86 + - .windows_vcvarsall_vs2022_x86_package variables: CMAKE_CONFIGURATION: windows_i386_package @@ -84,7 +96,7 @@ .windows_arm64_package: extends: - .windows_package - - .windows_vcvarsall_vs2022_x64_arm64 + - .windows_vcvarsall_vs2022_x64_arm64_package variables: CMAKE_CONFIGURATION: windows_arm64_package @@ -235,15 +247,6 @@ - msvc-19.32 - nonconcurrent -.windows_tags_nonconcurrent_vs2022_arm64: - tags: - - cmake # Since this is a bare runner, pin to a project. - - windows - - shell - - vs2022 - - msvc-19.32-arm64 - - nonconcurrent - .windows_tags_concurrent_vs2022: tags: - cmake # Since this is a bare runner, pin to a project. @@ -269,6 +272,24 @@ - shell - concurrent +.windows_tags_x86_64_package: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - vs2022 + - msvc-19.32 + - nonconcurrent + +.windows_tags_arm64_package: + tags: + - cmake # Since this is a bare runner, pin to a project. + - windows + - shell + - vs2022 + - msvc-19.32-arm64 + - nonconcurrent + ## Windows-specific scripts .before_script_windows: &before_script_windows -- cgit v0.12 From b87645b6a57b3c37b28b74f93f6b189079eb67aa Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 18 Aug 2022 09:41:08 -0400 Subject: gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset Restore the change from commit 6f17996edc (gitlab-ci: Update Windows builds to MSVC 14.33 toolset, 2022-08-15, v3.24.1~3^2), but not for packaging jobs. `cmake-gui` is still buggy when compiled with the newer toolset. Issue: #23859 --- .gitlab/os-windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index e693dcb..282cf1e 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -35,13 +35,13 @@ variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vcvarsall_vs2022_x86: variables: VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x86" - VCVARSVERSION: "14.32.31326" + VCVARSVERSION: "14.33.31629" .windows_vcvarsall_vs2022_x64_package: variables: @@ -110,7 +110,7 @@ CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" + CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" .windows_vs2019_x64: @@ -244,7 +244,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - nonconcurrent .windows_tags_concurrent_vs2022: @@ -253,7 +253,7 @@ - windows - shell - vs2022 - - msvc-19.32 + - msvc-19.33 - concurrent .windows_tags_concurrent_vs2019: -- cgit v0.12