From 5d833f433afe955cc01edc372c17f0059ab99492 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu, 10 Dec 2020 12:48:32 +0100
Subject: [PATCH] ci: Only run the sanity job if there's a MR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As it will fail right away if there isn't, and that prevents the CI to
run on people's branches.

$ ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
ERROR: No open merge request against mesa/mesa with sha 9f6aba4be0ceb59d35732651cc44f676e93b70b5

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: d4151f2e ("ci: Run sanity job only in pre-merge pipelines")
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8032>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7debe716b2..9c2c3cda91c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -500,7 +500,7 @@ sanity:
     - .fdo.ci-fairy
   stage: sanity
   rules:
-    - if: *is-forked-branch-or-pre-merge
+    - if: *is-pre-merge
       when: on_success
     # Other cases default to never
   variables: