From d0dd0ad1c321be10d2062bb9516f9b36f1f6bc6b Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 19 Jun 2023 11:16:01 +0100
Subject: [PATCH] Revert "ci: remove clang-format testing"

This reverts commit d666a8d259a0bb0a14e5bf42e90f167e150f185b.

Let's move past that tantrum and hope we can have an adult conversation
if one person wants to go against all the other developers.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23719>
---
 .gitlab-ci/test/gitlab-ci.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index d12bde9..58ed67d 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -30,6 +30,24 @@ rustfmt:
     - shopt -s globstar
     - rustfmt --check --verbose src/**/lib.rs
 
+clang-format:
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: lint
+  extends:
+    - .use-debian/x86_64_build
+    - .lint-clang-format-rules
+  variables:
+    GIT_STRATEGY: fetch
+    LLVM_VERSION: 15
+  script:
+    - shopt -s globstar
+    # We need a meson build dir, but its config doesn't actually matter, so
+    # let's just use the default.
+    - meson setup build
+    - ninja -C build clang-format
+    - git diff --color=always --exit-code  # Fails if there are diffs
+
 .test-gl:
   extends:
     - .test
-- 
2.7.4