Skip to content

Commit 508298d

Browse files
committed
Automate golangci-lint version bumps via Dependabot
Signed-off-by: Bharath Nallapeta <nr.bharath97@gmail.com>
1 parent 549e5ac commit 508298d

File tree

7 files changed

+619
-487
lines changed

7 files changed

+619
-487
lines changed

.github/workflows/update-golangci-lint.yaml

Lines changed: 0 additions & 56 deletions
This file was deleted.

Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ GO_APIDIFF_VER := v0.8.2
5656
GO_APIDIFF_BIN := go-apidiff
5757
GO_APIDIFF_PKG := github.com/joelanford/go-apidiff
5858

59+
# golangci-lint
60+
GOLANGCI_LINT_BIN := golangci-lint
61+
GOLANGCI_LINT_VER := $(shell cd hack/tools && go list -m -f '{{.Version}}' github.com/golangci/golangci-lint/v2)
62+
GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
63+
5964
# govulncheck
6065
GOVULNCHECK_VER := v1.1.4
6166
GOVULNCHECK_BIN := govulncheck
@@ -69,7 +74,7 @@ CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
6974
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
7075
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
7176
GOJQ := $(TOOLS_BIN_DIR)/gojq
72-
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
77+
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
7378
GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum
7479
KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
7580
MOCKGEN := $(TOOLS_BIN_DIR)/mockgen
@@ -280,6 +285,12 @@ $(GOVULNCHECK_BIN): $(GOVULNCHECK) ## Build a local copy of govulncheck.
280285
$(GOVULNCHECK): # Build govulncheck.
281286
GOBIN=$(abspath $(TOOLS_BIN_DIR)) $(GO_INSTALL) $(GOVULNCHECK_PKG) $(GOVULNCHECK_BIN) $(GOVULNCHECK_VER)
282287

288+
.PHONY: $(GOLANGCI_LINT_BIN)
289+
$(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT) ## Build a local copy of golangci-lint.
290+
291+
$(GOLANGCI_LINT): # Build golangci-lint.
292+
GOBIN=$(abspath $(TOOLS_BIN_DIR)) $(GO_INSTALL) $(GOLANGCI_LINT_PKG) $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
293+
283294
## --------------------------------------
284295
##@ Linting
285296
## --------------------------------------

hack/tools/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
ROOT_DIR_RELATIVE := ../..
1616
include $(ROOT_DIR_RELATIVE)/common.mk
1717

18-
GOLANGCI_LINT_VERSION ?= v2.10.1
19-
2018
# GOTESTSUM version without the leading 'v'
2119
GOTESTSUM_VERSION ?= 1.12.0
2220

@@ -126,9 +124,6 @@ GOJQ := $(BIN_DIR)/gojq
126124
$(GOJQ): go.mod go.sum | $(BIN_DIR)
127125
go build -tags=tools -o $@ github.com/itchyny/gojq/cmd/gojq
128126

129-
GOLANGCI_LINT := $(BIN_DIR)/golangci-lint
130-
$(GOLANGCI_LINT): Makefile ensure-golangci-lint.sh | $(BIN_DIR)
131-
./ensure-golangci-lint.sh -b $(BIN_DIR) $(GOLANGCI_LINT_VERSION)
132127

133128
KUSTOMIZE := $(BIN_DIR)/kustomize
134129
$(KUSTOMIZE): go.mod go.sum | $(BIN_DIR) # Build kustomize from tools folder.

0 commit comments

Comments
 (0)