From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 2 Sep 2021 17:12:29 +0000 (+0000)
Subject: Avoid duplicate pipeline runs for merge requests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f0a208b48d54da748363608b1465d32d541052;p=thirdparty%2Fopenldap.git

Avoid duplicate pipeline runs for merge requests
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74db3035c2..7e152b047c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,9 @@ workflow:
   rules:
     - if: '$CI_COMMIT_REF_NAME == "master" && $CI_PROJECT_NAMESPACE != "openldap"'
       when: never
-    - if: '$CI_COMMIT_REF_NAME == "OPENLDAP_REL_ENG_2_5" && $CI_PROJECT_NAMESPACE != "openldap"'
+    - if: '$CI_COMMIT_REF_NAME =~ /^OPENLDAP_REL_ENG_/ && $CI_PROJECT_NAMESPACE != "openldap"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
       when: never
     - when: always