From: Eric Engestrom <eric@igalia.com>
Date: Fri, 8 Sep 2023 18:15:15 +0000 (+0100)
Subject: ci: remove duplicate fork pipeline in MRs
X-Git-Tag: upstream/23.3.3~2112
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=717cff829c51bd084a1592ab1b35408b52ca6b22;p=platform%2Fupstream%2Fmesa.git

ci: remove duplicate fork pipeline in MRs

The argument for keeping this duplicate was to not affect
the ci_run_n_monitor script (which by default picked the pipeline in the
user's fork), but the script already supported specifying
a `--pipeline-url` to support that use-case, and it now automatically
picks the MR pipeline if there is no fork pipeline.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25154>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08e64fa..83adc83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 workflow:
   rules:
     # do not duplicate pipelines on merge pipelines
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN == "marge-bot"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
       when: never
     # merge pipeline
     - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null