Module: Mesa
Branch: master
Commit: cbdb87c678cff96d41f1eb07f8161e4068df392e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbdb87c678cff96d41f1eb07f8161e4068df392e
Author: Michel Dänzer <mdaen...@redhat.com>
Date: Tue Jul 14 11:12:19 2020 +0200
gitlab-ci: Fix "triggered by Marge for a merge request" rule
The commit below changed the rule such that it accidentally also applied
to the non-MR pipelines created by Marge, resulting in Marge triggering
twice as many jobs as necessary.
Fixes: 549b4a3dd4ab "gitlab-ci: Automatically run pipelines for Marge
Bot pre-merge only"
Acked-by: Daniel Stone <dani...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5898>
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82a2abf939a..e769069370d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,7 +173,7 @@ success:
when: on_success
# Run pipeline by default if it was triggered by Marge Bot, is for a
# merge request, and any files affecting the pipeline were changed
- - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PROJECT_PATH !=
"mesa/mesa"'
+ - if: '$GITLAB_USER_LOGIN == "marge-bot" &&
$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
changes:
*all_paths
when: on_success
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
