From 70eff587673ceec181efda86d2e93ede44a59532 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 18 Jul 2023 18:15:08 +0100
Subject: [PATCH] ci: allow hw jobs even if lint jobs fail for non-Marge
 pipelines

Signed-off-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24257>
---
 .gitlab-ci/test/gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 9b55107a5f7..0d2281c53fc 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -23,6 +23,11 @@
   stage: lint
   extends:
     - .use-debian/x86_64_build
+  rules:
+    # in merge pipeline, don't touch the default settings
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null
+    # in other pipelines, formatting checks are allowed to fail
+    - allow_failure: true
   variables:
     GIT_STRATEGY: fetch
   script: