ci: fix rules for formatting checks

Fixes: 70eff58767 ("ci: allow hw jobs even if lint jobs fail for non-Marge pipelines") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26511>
2023-12-04 21:45:33 +00:00
parent 72ad0db505
commit d971e3ba45
2 changed files with 16 additions and 7 deletions
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -25,11 +25,6 @@
  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
  timeout: 10m