diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-22 13:46:13 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-22 09:46:29 -0400 |
| commit | b9dd9b09a22688c3a95adc4a2568192f5a73d8e8 (patch) | |
| tree | 14f6bccdf85ca09eb699e23853076c415b050525 /.gitlab-ci.yml | |
| parent | 7f02daba647dea6100906070534485aac9060dea (diff) | |
| parent | b87645b6a57b3c37b28b74f93f6b189079eb67aa (diff) | |
| download | cmake-b9dd9b09a22688c3a95adc4a2568192f5a73d8e8.tar.gz | |
Merge topic 'ci-msvc-14.33'
b87645b6a5 gitlab-ci: Update non-packaging Windows builds to MSVC 14.33 toolset
cb8b27a901 gitlab-ci: Use separate MSVC toolset specification for packaging jobs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7597
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 bfc713f8e8..fa11b1541a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1079,7 +1079,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 @@ -1093,7 +1093,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 @@ -1116,7 +1116,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 @@ -1130,7 +1130,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 @@ -1153,7 +1153,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 @@ -1167,7 +1167,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 |