Bump golangci-lint version

Signed-off-by: Andrea Mazzotti <[email protected]>

.github/workflows/golangci-lint.yml → .github/workflows/golangci-lint.yaml

@@ -25,9 +25,9 @@ jobs:
         with:
           go-version: '=1.23.0'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.3.1
+        uses: golangci/golangci-lint-action@v6.5.2
         with:
-          version: v1.60.2
+          version: v1.64.5
           working-directory: ${{matrix.working-directory}}
           args: --timeout=5m0s
           skip-cache: true

.golangci.yml

@@ -1,10 +1,10 @@
 # Options for analysis running.
 run:
-  go: "1.22"
-  skip-files:
-    - ".*_test\\.go$"
+  go: "1.23"
   allow-parallel-runners: true
 issues:
+  exclude-files:
+    - ".*_test\\.go$"
   include:
     - EXC0012
     - EXC0014
@@ -137,8 +137,6 @@ linters:
     - tagliatelle
     - exhaustruct
     - exhaustive
-    - exhaustivestruct
-    - maligned
     - funlen
     - wrapcheck
     - goerr113  
@@ -150,21 +148,11 @@ linters:
     - nonamedreturns
     - gocritic
     - nlreturn
-    - gomnd
     - mnd
     - ireturn
     - depguard
     - containedctx 
     - godox
-    # The following are all deprecated linters
-    - deadcode
-    - ifshort
-    - varcheck
-    - scopelint
-    - interfacer
-    - structcheck
-    - golint
-    - nosnakecase
     # Disabled because of generics
     - rowserrcheck
     - sqlclosecheck

Makefile

@@ -157,9 +157,10 @@ CLUSTERCTL_VER := v1.7.7
 CLUSTERCTL_BIN := clusterctl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)
 
-GOLANGCI_LINT_VER := v1.60.2
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN))
+GOLANGCI_LINT_VER := $(shell cat .github/workflows/golangci-lint.yaml | grep [[:space:]]version: | sed 's/.*version: //')
+GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
+GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 
 NOTES_BIN := notes
 NOTES := $(abspath $(TOOLS_BIN_DIR)/$(NOTES_BIN))
@@ -505,10 +506,8 @@ $(UPDATECLI): # Install updatecli
 	cd ${TOOLS_BIN_DIR} && chmod +x updatecli
 	cd ${TOOLS_BIN_DIR} && mv updatecli $(UPDATECLI_BIN)-$(UPDATECLI_VER)
 
-$(GOLANGCI_LINT): # Download and install golangci-lint
-	hack/ensure-golangci-lint.sh \
-		-b $(TOOLS_BIN_DIR) \
-		$(GOLANGCI_LINT_VER)
+$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
+	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOLANGCI_LINT_PKG) $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
 
 $(NOTES): # Download and install note generator from cluster-api commit
 	hack/make-release-notes.sh $(TOOLS_BIN_DIR)