Browse Source

Merge topic 'gitlab-ci-prefer-mr' into release-3.18

f6a80ffd54 gitlab-ci: Prefer MR rules for any pipeline associated with a MR

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5214
Brad King 5 years ago
parent
commit
06cb6a1628
1 changed files with 4 additions and 4 deletions
  1. 4 4
      .gitlab/rules.yml

+ 4 - 4
.gitlab/rules.yml

@@ -2,17 +2,17 @@
 
 .run_manually:
     rules:
+        - if: '$CI_MERGE_REQUEST_ID'
+          when: manual
         - if: '$CI_PROJECT_PATH == "cmake/cmake"'
           when: delayed
           start_in: 5 minutes
-        - if: '$CI_MERGE_REQUEST_ID'
-          when: manual
         - when: never
 
 .run_automatically:
     rules:
-        - if: '$CI_PROJECT_PATH == "cmake/cmake"'
-          when: on_success
         - if: '$CI_MERGE_REQUEST_ID'
           when: on_success
+        - if: '$CI_PROJECT_PATH == "cmake/cmake"'
+          when: on_success
         - when: never