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

Author: Michel Dänzer <[email protected]>
Date:   Tue Sep  8 17:58:32 2020 +0200

ci: Add "is pre-merge pipeline" YAML anchor

Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6566>

---

 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 729a1f41c7b..c4cc6886190 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,6 +59,9 @@ stages:
     # 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
+    - if: &is-pre-merge '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 
$CI_COMMIT_REF_NAME'
+      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
@@ -151,7 +154,7 @@ success:
       when: never
     - changes: *all_paths
       when: never
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
+    - if: *is-pre-merge
       when: on_success
   variables:
     GIT_STRATEGY: none

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to