diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 13:29:02 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-11 08:29:11 -0500 |
| commit | 96b939584b02dcb78b2fa5ee8f709a4224189b9b (patch) | |
| tree | 1633987bd1f55610a53137f5941d3abbf343cf89 /.gitlab-ci.yml | |
| parent | b22715c144b162be313ff9d9590388a709212b1b (diff) | |
| parent | bd5176abac08b7b5f3a254fb9919bb1b5cd1ead6 (diff) | |
| download | cmake-96b939584b02dcb78b2fa5ee8f709a4224189b9b.tar.gz | |
Merge topic 'ci-msvc-14.34'
bd5176abac gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset
ccdff280f4 gitlab-ci: Update Windows non-packaging builds to MSVC 14.34 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7891
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 644d8711ed..83bd9ef918 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1121,7 +1121,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 @@ -1135,7 +1135,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 @@ -1158,7 +1158,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 @@ -1172,7 +1172,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 @@ -1195,7 +1195,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 @@ -1209,7 +1209,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 |