summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2020-08-31 18:49:42 +0200
committerMarge Bot <eric+marge@anholt.net>2020-09-01 07:27:31 +0000
commit0308e639cf7ab30eef15fe5529138675a5e616e8 (patch)
treece20e611c8b6f7a2416f1db88ff20b661e39d628
parentf13f32f83f379b777a7665ffd7d2a1e7aaaf3a62 (diff)
ci: Don't exclude "success" job from mesa/mesa pipelines for MRs
Since the last GitLab update, pre-merge pipelines for MRs run in the mesa/mesa namespace, so this job didn't get created anymore, causing trouble. Reviewed-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6522>
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13a9caecd6a..35593d7909f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,7 +119,7 @@ success:
image: debian:stable-slim
rules:
- *ignore_scheduled_pipelines
- - if: '$CI_PROJECT_NAMESPACE == "mesa"'
+ - if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
when: never
- if: '$GITLAB_USER_LOGIN == "marge-bot"'
changes: *docs-or-ci