Skip to content

Commit 5aca657

Browse files
ncdcxrstf
authored andcommitted
UPSTREAM: <carry>: make: use go install for lint
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
1 parent 58443a8 commit 5aca657

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
7373
cd $(TOOLS_DIR) && go build -tags=tools -o bin/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
7474

7575
$(GOLANGCI_LINT): .github/workflows/golangci-lint.yml # Download golanci-lint using hack script into tools folder.
76-
hack/ensure-golangci-lint.sh \
77-
-b $(TOOLS_BIN_DIR) \
78-
$(shell cat .github/workflows/golangci-lint.yml | grep version | sed 's/.*version: //')
76+
GOBIN=$(abspath $(TOOLS_BIN_DIR)) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(shell cat .github/workflows/golangci-lint.yml | grep version | sed 's/.*version: //')
7977

8078
.PHONY: tools
8179
tools: $(GO_APIDIFF) $(CONTROLLER_GEN) $(GOLANGCI_LINT)

0 commit comments

Comments
 (0)