From 304077498deeae33e244683d2f714a31e8dbbbd0 Mon Sep 17 00:00:00 2001
From: Jan Larwig <jan@larwig.com>
Date: Tue, 18 Aug 2026 08:57:42 +0200
Subject: [PATCH] ci: use go tool for running golangci-lint

Signed-off-by: Jan Larwig <jan@larwig.com>
---
 .github/renovate.json5                |  9 +++++++++
 .github/workflows/ci.yml              |  6 ------
 .github/workflows/publish-release.yml |  6 ------
 Makefile                              | 11 ++++++++---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1670dcba..48385e05 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -46,6 +46,15 @@
       depNameTemplate: "alpine",
       datasourceTemplate: "docker",
     },
+    {
+      customType: "regex",
+      fileMatch: [
+        "^Makefile",
+      ],
+      matchStrings: [
+        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)\\s+?GOLANGCILINT_VERSION \\?= (?<currentValue>.*)\\s",
+      ],
+    },
     {
       customType: "regex",
       fileMatch: ["(^|/)\\.github/workflows/[^/]+\\.ya?ml$"],
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21366793..099c9e6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,12 +35,6 @@ jobs:
         go-version: ${{ steps.go-version.outputs.version }}
         check-latest: true
 
-    - name: Install golangci-lint
-      uses: golangci/golangci-lint-action@v9
-      with:
-        install-only: true
-        version: v2.11.4 # renovate: datasource=github-tags depName=golangci/golangci-lint
-
     - name: Verify Code Generation
       run: |
         make verify-generate
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 4c1651f0..8ccbdd90 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -55,12 +55,6 @@ jobs:
         go-version: ${{ steps.go-version.outputs.version }}
         check-latest: true
 
-    - name: Install golangci-lint
-      uses: golangci/golangci-lint-action@v9
-      with:
-        install-only: true
-        version: v2.11.4 # renovate: datasource=github-tags depName=golangci/golangci-lint
-
     - name: Get go dependencies
       run: |
         go mod download
diff --git a/Makefile b/Makefile
index 319d3ddb..7d81d9d0 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ help: ## Display this help
 
 
 GO ?= go
-GOLANGCILINT ?= golangci-lint
+# renovate: datasource=github-tags depName=golangci/golangci-lint
+GOLANGCILINT_VERSION ?= v2.11.4
 
 BINARY := oauth2-proxy
 VERSION ?= $(shell git describe --always --dirty --tags 2>/dev/null || echo "undefined")
@@ -143,7 +144,7 @@ verify-generate: generate ## Verify command to check if alpha config docs are in
 ##@ Miscellaneous
 
 .PHONY: test
-test: lint ## Run all Go tests
+test: ## Run all Go tests
 	GO111MODULE=on $(GO) test $(TESTCOVER) -v -race ./...
 
 .PHONY: release
@@ -157,7 +158,11 @@ clean: ## Cleanup release and build files
 
 .PHONY: lint
 lint: validate-go-version ## Lint all files using golangci-lint
-	GO111MODULE=on $(GOLANGCILINT) run
+	GO111MODULE=on $(GO) run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCILINT_VERSION) run --timeout 10m
+
+.PHONY: lint-fix
+lint-fix: validate-go-version ## Lint all files and apply fixes using golangci-lint
+	GO111MODULE=on $(GO) run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCILINT_VERSION) run --timeout 10m --fix
 
 .PHONY: validate-go-version
 validate-go-version: ## Validate Go environment requirements