diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-11 17:06:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-11 17:51:32 (GMT) |
| commit | ac32794983dbd84f6e0ed6c8a92268f58b3fed88 (patch) | |
| tree | 799cec7d69fd86488e73634bbe266b9c0deb85c1 | |
| parent | 2ad300ebd73c6aca7189a9f8ea8d8ad61e9c3223 (diff) | |
| download | CMake-ac32794983dbd84f6e0ed6c8a92268f58b3fed88.zip CMake-ac32794983dbd84f6e0ed6c8a92268f58b3fed88.tar.gz CMake-ac32794983dbd84f6e0ed6c8a92268f58b3fed88.tar.bz2 | |
gitlab-ci: Re-organize Windows job tags
Name the tag groups based on the VS version needed.
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .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 |