From f8e430f4a8eea002cef077d99c6d42fa8e8b0bf0 Mon Sep 17 00:00:00 2001
From: Evan Baker <rbtr@users.noreply.github.com>
Date: Tue, 19 Dec 2023 15:57:05 -0600
Subject: [PATCH] fix: change to new-from-rev master in lint action (#2448)

Signed-off-by: GitHub <noreply@github.com>
---
 .github/workflows/golangci.yaml | 5 ++---
 .golangci.yml                   | 1 +
 Makefile                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/golangci.yaml b/.github/workflows/golangci.yaml
index 6187ea83b..37ce503c8 100644
--- a/.github/workflows/golangci.yaml
+++ b/.github/workflows/golangci.yaml
@@ -26,6 +26,5 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.55.2
-        args: --timeout=25m
-        only-new-issues: true
+        version: v1.55
+        args: --new-from-rev=origin/master --config=.golangci.yml --timeout=25m 
diff --git a/.golangci.yml b/.golangci.yml
index 41eb7865e..b0d9e59c0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,7 @@
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
+  new-from-rev: origin/master
 linters:
   presets: 
   - bugs
diff --git a/Makefile b/Makefile
index 2fe3a5246..34a5d46e1 100644
--- a/Makefile
+++ b/Makefile
@@ -743,7 +743,7 @@ clean: ## Clean build artifacts.
 LINT_PKG ?= .
 
 lint: $(GOLANGCI_LINT) ## Fast lint vs default branch showing only new issues.
-	GOGC=20 $(GOLANGCI_LINT) run --new-from-rev master --timeout 10m -v $(LINT_PKG)/...
+	GOGC=20 $(GOLANGCI_LINT) run --timeout 25m -v $(LINT_PKG)/...
 
 lint-all: $(GOLANGCI_LINT) ## Lint the current branch in entirety.
 	GOGC=20 $(GOLANGCI_LINT) run -v $(LINT_PKG)/...