Explorar o código

gitlab-ci: use separate rules for dependent jobs

Brad King %!s(int64=5) %!d(string=hai) anos
pai
achega
a7afd8d3b0
Modificáronse 2 ficheiros con 19 adicións e 9 borrados
  1. 9 9
      .gitlab-ci.yml
  2. 10 0
      .gitlab/rules.yml

+ 9 - 9
.gitlab-ci.yml

@@ -101,7 +101,7 @@ test:fedora31-makefiles:
         - .fedora31_makefiles
         - .cmake_test_linux_package
         - .linux_builder_tags_qt
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:centos6-release
     needs:
@@ -112,7 +112,7 @@ test:cuda10.2-nvidia:
         - .cuda10.2_nvidia
         - .cmake_test_linux_package
         - .linux_builder_tags_cuda
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:centos6-release
     needs:
@@ -132,7 +132,7 @@ test:fedora31-ninja:
         - .cmake_test_linux
         - .linux_builder_tags_x11
         - .cmake_test_artifacts
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:fedora31-ninja
     needs:
@@ -143,7 +143,7 @@ test:fedora31-ninja-multi:
         - .fedora31_ninja_multi
         - .cmake_test_linux_external
         - .linux_builder_tags_qt
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - test:fedora31-ninja
     needs:
@@ -165,7 +165,7 @@ test:macos-ninja:
         - .cmake_test_macos
         - .cmake_test_artifacts
         - .macos_builder_tags
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:macos-ninja
     needs:
@@ -184,7 +184,7 @@ test:macos-makefiles:
         - .macos_makefiles
         - .cmake_test_macos
         - .macos_builder_tags
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:macos-makefiles
     needs:
@@ -195,7 +195,7 @@ test:macos-xcode:
         - .macos_xcode
         - .cmake_test_macos_external
         - .macos_builder_ext_tags
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - test:macos-ninja
     needs:
@@ -240,7 +240,7 @@ test:windows-vs2019-x64-ninja:
         - .cmake_test_windows
         - .windows_builder_tags
         - .cmake_test_artifacts
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - build:windows-vs2019-x64-ninja
     needs:
@@ -251,7 +251,7 @@ test:windows-vs2019-x64:
         - .windows_vs2019_x64
         - .cmake_test_windows_external
         - .windows_builder_ext_tags
-        - .run_automatically
+        - .run_dependent
     dependencies:
         - test:windows-vs2019-x64-ninja
     needs:

+ 10 - 0
.gitlab/rules.yml

@@ -21,6 +21,16 @@
           when: on_success
         - when: never
 
+.run_dependent:
+    rules:
+        - if: '$CMAKE_CI_PACKAGE == "true"'
+          when: never
+        - if: '$CI_MERGE_REQUEST_ID'
+          when: on_success
+        - if: '$CI_PROJECT_PATH == "cmake/cmake"'
+          when: on_success
+        - when: never
+
 .run_only_for_package:
     rules:
         - if: '$CMAKE_CI_PACKAGE == "true"'