Skip to content

Commit 3694bfc

Browse files
committed
fix: install golangci-lint using recommended method
Signed-off-by: Mateusz Urbanek <[email protected]>
1 parent 5f45478 commit 3694bfc

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ KUSTOMIZE ?= $(TOOLBIN)/kustomize
169169
MDBOOK ?= $(TOOLBIN)/mdbook
170170

171171
# Tool Versions
172-
CHAINSAW_VERSION ?= v0.2.11
172+
CHAINSAW_VERSION ?= v0.2.12
173173
CRD_REF_DOCS_VERSION ?= v0.1.0
174-
CTLPTL_VERSION ?= v0.8.35
175-
GOLANGCI_LINT_VERSION ?= v1.61.0
176-
KIND_VERSION ?= v0.24.0
177-
KUSTOMIZE_VERSION ?= v5.5.0
178-
MDBOOK_VERSION ?= v0.4.45
174+
CTLPTL_VERSION ?= v0.8.39
175+
GOLANGCI_LINT_VERSION ?= v1.64.7
176+
KIND_VERSION ?= v0.27.0
177+
KUSTOMIZE_VERSION ?= v5.6.0
178+
MDBOOK_VERSION ?= v0.4.47
179179

180180
.PHONY: chainsaw
181181
chainsaw: $(CHAINSAW)-$(CHAINSAW_VERSION)
@@ -195,7 +195,7 @@ $(CTLPTL)-$(CTLPTL_VERSION): $(TOOLBIN)
195195
.PHONY: golangci-lint
196196
golangci-lint: $(GOLANGCI_LINT)-$(GOLANGCI_LINT_VERSION)
197197
$(GOLANGCI_LINT)-$(GOLANGCI_LINT_VERSION): $(TOOLBIN)
198-
$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
198+
./hack/tools/install-golangci-lint.sh $(TOOLBIN) $(GOLANGCI_LINT) $(GOLANGCI_LINT_VERSION)
199199

200200
.PHONY: kind
201201
kind: $(KIND)-$(KIND_VERSION)
@@ -210,7 +210,7 @@ $(KUSTOMIZE)-$(KUSTOMIZE_VERSION): $(TOOLBIN)
210210
.PHONY: mdbook
211211
mdbook: $(MDBOOK)-$(MDBOOK_VERSION)
212212
$(MDBOOK)-$(MDBOOK_VERSION): $(TOOLBIN)
213-
./hack/install-mdbook.sh $(MDBOOK) $(MDBOOK_VERSION)
213+
./hack/tools/install-mdbook.sh $(MDBOOK) $(MDBOOK_VERSION)
214214

215215
# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
216216
# $1 - target path with name of binary

hack/tools/install-golangci-lint.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/env bash
2+
3+
set -eu
4+
5+
TOOLBIN="${1}"
6+
GOLANGCI_LINT="${2}"
7+
GOLANGCI_LINT_VERSION="${3}"
8+
9+
# If it exists, do not redownload
10+
if [ -f "${GOLANGCI_LINT}-${GOLANGCI_LINT_VERSION}" ]; then
11+
exit 0
12+
fi
13+
14+
INSTALLER="https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh"
15+
16+
curl -sSfL "${INSTALLER}" | sh -s -- -b "${TOOLBIN}" "${GOLANGCI_LINT_VERSION}"
17+
18+
mv "${TOOLBIN}/golangci-lint" "${GOLANGCI_LINT}-${GOLANGCI_LINT_VERSION}"
19+
ln -sf "${GOLANGCI_LINT}-${GOLANGCI_LINT_VERSION}" "${GOLANGCI_LINT}"
File renamed without changes.

0 commit comments

Comments
 (0)