소스 검색

gitlab-ci: Re-organize Windows job tags

Name the tag groups based on the VS version needed.
Brad King 4 년 전
부모
커밋
ac32794983
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 3
      .gitlab-ci.yml
  2. 2 2
      .gitlab/os-windows.yml

+ 3 - 3
.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:

+ 2 - 2
.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