diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-10 10:13:47 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-10 13:27:38 -0500 |
| commit | bd5176abac08b7b5f3a254fb9919bb1b5cd1ead6 (patch) | |
| tree | 67e4437524ac1daf4810e16321e89404d9272647 /.gitlab-ci.yml | |
| parent | ccdff280f4acebad0ac17d5d8380407c5dc606c0 (diff) | |
| download | cmake-bd5176abac08b7b5f3a254fb9919bb1b5cd1ead6.tar.gz | |
gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
Problems with `cmake-gui` when compiled with the MSVC 14.33 toolset,
that did not occur with the MSVC 14.32 toolset, no longer occur with the
MSVC 14.34 toolset. Revert commit cb8b27a901 (gitlab-ci: Use separate
MSVC toolset specification for packaging jobs, 2022-08-18, v3.24.2~24^2~1)
and update the remaining toolset version references.
Fixes: #23859
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4baba5486..712ebd1e26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1093,7 +1093,7 @@ b:windows-x86_64-package: - .windows_x86_64_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_x86_64_package + - .windows_tags_nonconcurrent_vs2022 - .run_only_for_package dependencies: - p:doc-package @@ -1107,7 +1107,7 @@ k:windows-x86_64-package: - .windows_x86_64_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_x86_64_package + - .windows_tags_nonconcurrent_vs2022 - .run_only_for_package dependencies: - b:windows-x86_64-package @@ -1130,7 +1130,7 @@ b:windows-i386-package: - .windows_i386_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_x86_64_package + - .windows_tags_nonconcurrent_vs2022 - .run_only_for_package dependencies: - p:doc-package @@ -1144,7 +1144,7 @@ k:windows-i386-package: - .windows_i386_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_x86_64_package + - .windows_tags_nonconcurrent_vs2022 - .run_only_for_package dependencies: - b:windows-i386-package @@ -1167,7 +1167,7 @@ b:windows-arm64-package: - .windows_arm64_package - .cmake_build_windows - .cmake_build_package_artifacts - - .windows_tags_arm64_package + - .windows_tags_nonconcurrent_vs2022_arm64 - .run_only_for_package dependencies: - p:doc-package @@ -1181,7 +1181,7 @@ k:windows-arm64-package: - .windows_arm64_package - .cmake_package_windows - .cmake_release_artifacts - - .windows_tags_arm64_package + - .windows_tags_nonconcurrent_vs2022_arm64 - .run_only_for_package dependencies: - b:windows-arm64-package |