From f6a80ffd545dcdc0c36f3ac878aa971f33f3ade5 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 10 Sep 2020 15:47:47 -0400
Subject: gitlab-ci: Prefer MR rules for any pipeline associated with a MR

GitLab 13.3 started creating MR pipelines in the parent project of a MR
from a fork, at least when the MR submitter is a developer in the parent
project.  If the pipeline is associated with a MR, we should use the
corresponding rules regardless of which project hosts the pipeline.
---
 .gitlab/rules.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 88756eb..3bb8ae4 100644
--- a/.gitlab/rules.yml
+++ b/.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
-- 
cgit v0.12