From 84628d8b68e4ad6e786e051072c4f11b692bd2b2 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Mon, 26 Feb 2024 12:16:27 +0100
Subject: run.sh, Makefile: ask golangci-lint to preformat output

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 69e63e472..e379f8e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -289,11 +289,15 @@ tidy: descriptions
 		-extra-arg=-DHOSTGOOS_$(HOSTOS)=1 -extra-arg=-DGIT_REVISION=\"$(REV)\" \
 		executor/*.cc
 
+ifdef CI
+  LINT-FLAGS := --out-format github-actions
+endif
+
 lint:
 	# This should install the command from our vendor dir.
 	CGO_ENABLED=1 $(HOSTGO) install github.com/golangci/golangci-lint/cmd/golangci-lint
 	CGO_ENABLED=1 $(HOSTGO) build -buildmode=plugin -o bin/syz-linter.so ./tools/syz-linter
-	bin/golangci-lint run ./...
+	bin/golangci-lint run $(LINT-FLAGS) ./...
 
 presubmit:
 	$(MAKE) presubmit_aux
-- 
cgit mrf-deployment