From 7136ca1999d9b053b1bcaf1269b00f6b6dd83e5a Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Wed, 4 Oct 2023 15:48:56 +0200
Subject: [PATCH] Use golangci-lint to lint zerolog (#2524)

---
 .golangci.yml | 1 +
 Makefile      | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 6d1b43a35..9b321ff0f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -33,6 +33,7 @@ linters:
     - gofumpt
     - errorlint
     - forbidigo
+    - zerologlint
 
 run:
   timeout: 5m
diff --git a/Makefile b/Makefile
index 77a90bd8f..40062a479 100644
--- a/Makefile
+++ b/Makefile
@@ -117,9 +117,6 @@ install-tools: ## Install development tools
 	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest; \
 	fi ; \
-	hash lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
-		go install github.com/rs/zerolog/cmd/lint@latest; \
-	fi ; \
 	hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		go install mvdan.cc/gofumpt@latest; \
 	fi ; \
@@ -139,10 +136,6 @@ ui-dependencies: ## Install UI dependencies
 lint: install-tools ## Lint code
 	@echo "Running golangci-lint"
 	golangci-lint run --timeout 15m
-	@echo "Running zerolog linter"
-	lint github.com/woodpecker-ci/woodpecker/cmd/agent
-	lint github.com/woodpecker-ci/woodpecker/cmd/cli
-	lint github.com/woodpecker-ci/woodpecker/cmd/server
 
 lint-ui: ## Lint UI code
 	(cd web/; pnpm install)