From: Colin Walters <walters@verbum.org>
Date: Mon, 1 May 2023 18:24:23 +0000 (-0400)
Subject: ci: Validate clang-format
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2~2^2~2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c1044a02b28982ef6dd58af98b23a40482d26487;p=ostree.git

ci: Validate clang-format
---

diff --git a/ci/codestyle.sh b/ci/codestyle.sh
index 850661e5..1db6c1f8 100755
--- a/ci/codestyle.sh
+++ b/ci/codestyle.sh
@@ -15,12 +15,23 @@ done
 echo "ok"
 fi
 
-# Will uncomment this once we reformat
-#if command -v clang-format; then
-#    echo -n "checking clang-format... "
-#    git ls-files '**.c' '**.cxx' '**.h' '**.hpp' | xargs clang-format --Werror --dry-run
-#    echo "ok"
-#fi
+if command -v clang-format; then
+    clang_ver=$(clang-format --version)
+    clang_min_ver=15
+    version_re=" version ([0-9]+)."
+    if [[ $clang_ver =~ $version_re ]]; then
+        if test "${BASH_REMATCH[1]}" -ge "${clang_min_ver}"; then
+            echo -n "checking clang-format... "
+            git ls-files '**.c' '**.cxx' '**.h' '**.hpp' | xargs clang-format --Werror --dry-run
+            echo "ok"
+        else
+            echo "notice: clang-format ${clang_ver}" is too old
+        fi
+    else
+        echo "failed to parse clang-format version ${clang_ver}" 1>&2
+        exit 1
+    fi
+fi
 
 echo -n 'grep-based static analysis... '
 patterns=(glnx_fd_close)