improve clang-tidy setup

jo-m · Dec 20, 2023 · d46232e · d46232e
1 parent 36d8c68
commit d46232e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,4 @@
+---
+BasedOnStyle: Google
+IndentWidth: 2
+ColumnLimit: 79
diff --git a/.dockerignore b/.dockerignore
@@ -2,6 +2,7 @@
 !go.mod
 !go.sum
 !Makefile
+!.clang-format
 
 !cmd
 !examples

diff --git a/Makefile b/Makefile
@@ -11,11 +11,12 @@ GO_STATICCHECK_VERSION = 2023.1.6
 DEFAULT: format build_host build_arm64
 
 format:
-	cd pkg/pmatch && clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 2, ColumnLimit: 79}" *.h *.c
+	bash -c "shopt -s globstar; clang-format -i **/*.c **/*.h"
 	gofmt -w .
 	go mod tidy
 
 lint:
+	bash -c "shopt -s globstar; clang-format --dry-run --Werror **/*.c **/*.h"
 	gofmt -l .; test -z "$$(gofmt -l .)"
 	go vet ./...
 	go run honnef.co/go/tools/cmd/staticcheck@$(GO_STATICCHECK_VERSION) -checks=all ./...
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     !go.mod
     !go.sum
     !Makefile
+    !.clang-format
     !cmd
     !examples
@@ Expand Down @@