Mesa (master): ci: Add "is post-merge pipeline, not for Marge Bot" YAML anchor

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a33026ee7c70721e18bcb36dcfd1d479baa9b666
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a33026ee7c70721e18bcb36dcfd1d479baa9b666

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Tue Sep  8 12:36:11 2020 +0200

ci: Add "is post-merge pipeline, not for Marge Bot" YAML anchor

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6566>

---

 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 542ec0d9935..de0b56b5352 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,9 @@ stages:
     # Pipeline runs for the master branch of the main project
     - if: &is-main-master '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master"'
       when: always
+    # Post-merge pipeline, not for Marge Bot
+    - if: &is-post-merge-not-for-marge '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
+      when: on_success
     # Pre-merge pipeline for Marge Bot
     - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       when: on_success
@@ -85,7 +88,7 @@ test-docs:
     - if: *is-pre-merge-for-marge
       changes: *docs-or-ci
       when: on_success
-    - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
+    - if: *is-post-merge-not-for-marge
       changes: *docs-or-ci
       when: on_success
     - if: '$CI_PROJECT_PATH != "mesa/mesa" || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
@@ -195,7 +198,7 @@ success:
       when: on_success
     # Run pipeline by default in the main project if it was not triggered by
     # Marge Bot, and any files affecting the pipeline were changed
-    - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
+    - if: *is-post-merge-not-for-marge
       changes:
         *all_paths
       when: on_success