@@ -159,6 +159,11 @@ GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
159
159
GINKGO := $(abspath $(TOOLS_BIN_DIR ) /$(GINKGO_BIN ) -$(GINGKO_VER ) )
160
160
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
161
161
162
+ GOLANGCI_LINT_BIN := golangci-lint
163
+ GOLANGCI_LINT_VER := $(shell cat .github/workflows/golangci-lint.yml | grep [[:space:]]version: | sed 's/.* version: //')
164
+ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR ) /$(GOLANGCI_LINT_BIN ) -$(GOLANGCI_LINT_VER ) )
165
+ GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
166
+
162
167
CONVERSION_VERIFIER_BIN := conversion-verifier
163
168
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR ) /$(CONVERSION_VERIFIER_BIN ) )
164
169
@@ -175,9 +180,6 @@ RUNTIME_OPENAPI_GEN := $(abspath $(TOOLS_BIN_DIR)/$(RUNTIME_OPENAPI_GEN_BIN))
175
180
TILT_PREPARE_BIN := tilt-prepare
176
181
TILT_PREPARE := $(abspath $(TOOLS_BIN_DIR ) /$(TILT_PREPARE_BIN ) )
177
182
178
- GOLANGCI_LINT_BIN := golangci-lint
179
- GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR ) /$(GOLANGCI_LINT_BIN ) )
180
-
181
183
# Define Docker related variables. Releases should modify and double check these vars.
182
184
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
183
185
PROD_REGISTRY ?= registry.k8s.io/cluster-api
@@ -1239,11 +1241,11 @@ $(YQ_BIN): $(YQ) ## Build a local copy of yq
1239
1241
.PHONY : $(TILT_PREPARE_BIN )
1240
1242
$(TILT_PREPARE_BIN ) : $(TILT_PREPARE ) # # Build a local copy of tilt-prepare.
1241
1243
1242
- .PHONY : $(GOLANGCI_LINT_BIN )
1243
- $(GOLANGCI_LINT_BIN ) : $(GOLANGCI_LINT ) # # Build a local copy of golangci-lint
1244
-
1245
1244
.PHONY : $(GINKGO_BIN )
1246
- $(GINKGO_BIN ) : $(GINKGO ) # # Build a local copy of ginkgo
1245
+ $(GINKGO_BIN ) : $(GINKGO ) # # Build a local copy of ginkgo.
1246
+
1247
+ .PHONY : $(GOLANGCI_LINT_BIN )
1248
+ $(GOLANGCI_LINT_BIN ) : $(GOLANGCI_LINT ) # # Build a local copy of golangci-lint.
1247
1249
1248
1250
$(CONTROLLER_GEN ) : # Build controller-gen from tools folder.
1249
1251
GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(CONTROLLER_GEN_PKG ) $(CONTROLLER_GEN_BIN ) $(CONTROLLER_GEN_VER )
@@ -1290,14 +1292,12 @@ $(KPROMO):
1290
1292
$(YQ ) :
1291
1293
GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(YQ_PKG ) $(YQ_BIN ) ${YQ_VER}
1292
1294
1293
- $(GOLANGCI_LINT ) : .github/workflows/golangci-lint.yml # Download golangci-lint using hack script into tools folder.
1294
- hack/ensure-golangci-lint.sh \
1295
- -b $(TOOLS_BIN_DIR ) \
1296
- $(shell cat .github/workflows/golangci-lint.yml | grep [[:space:]]version: | sed 's/.* version: //')
1297
-
1298
1295
$(GINKGO ) : # Build ginkgo from tools folder.
1299
1296
GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(GINKGO_PKG ) $(GINKGO_BIN ) $(GINGKO_VER )
1300
1297
1298
+ $(GOLANGCI_LINT ) : # Build golangci-lint from tools folder.
1299
+ GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(GOLANGCI_LINT_PKG ) $(GOLANGCI_LINT_BIN ) $(GOLANGCI_LINT_VER )
1300
+
1301
1301
# # --------------------------------------
1302
1302
# # Helpers
1303
1303
# # --------------------------------------
0 commit comments