ci: Don't exclude "success" job from mesa/mesa pipelines for MRs
authorMichel Dänzer <mdaenzer@redhat.com>
Mon, 31 Aug 2020 16:49:42 +0000 (18:49 +0200)
committerMarge Bot <eric+marge@anholt.net>
Tue, 1 Sep 2020 07:27:31 +0000 (07:27 +0000)
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>

.gitlab-ci.yml

index 13a9caecd6a4dfdc2e01a1bc0e8db111a854d281..35593d7909f6881874a8c678f4e4cec4e43d6a2a 100644 (file)
@@ -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