Skip to content

Commit d355ad2

Browse files
committed
lint: downgrade golangci-lint to 1.23.8
in golangci-lint 1.24.0 causing out-of-memory see [1] so for now pin the version to 1.23.8 [1] - golangci/golangci-lint#994
1 parent 973059e commit d355ad2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Makefile

+6-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ IMAGE_BUILD_OPTS += $(DOCKERARGS)
3636

3737
# Go tools
3838
GO = go
39-
GOLINT = $(GOBIN)/golangci-lint
39+
GOLANGCI_LINT_VERSION = v1.23.8
40+
GOLANGCI_LINT = $(GOBIN)/golangci-lint
4041
TIMEOUT = 15
4142
V = 0
4243
Q = $(if $(filter 1,$V),,@)
@@ -65,8 +66,8 @@ $(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR)
6566

6667
# Tools
6768

68-
$(GOLINT): | $(BASE) ; $(info building golangci-lint...)
69-
$Q go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
69+
$(GOLANGCI_LINT): | $(BASE) ; $(info building golangci-lint...)
70+
$Q curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOBIN) $(GOLANGCI_LINT_VERSION)
7071

7172
GOVERALLS = $(GOBIN)/goveralls
7273
$(GOBIN)/goveralls: | $(BASE) ; $(info building goveralls...)
@@ -75,9 +76,9 @@ $(GOBIN)/goveralls: | $(BASE) ; $(info building goveralls...)
7576
# Tests
7677

7778
.PHONY: lint
78-
lint: | $(BASE) $(GOLINT) ; $(info running golangci-lint...) @ ## Run golangci-lint
79+
lint: | $(BASE) $(GOLANGCI_LINT) ; $(info running golangci-lint...) @ ## Run golangci-lint
7980
$Q cd $(BASE) && ret=0 && \
80-
test -z "$$($(GOLINT) run --timeout 10m0s | tee /dev/stderr)" || ret=1 ; \
81+
test -z "$$($(GOLANGCI_LINT) run --timeout 10m0s | tee /dev/stderr)" || ret=1 ; \
8182
exit $$ret
8283

8384
plugins: noop-plugin ufm-plugin ; $(info Building plugins...) ## Build plugins

0 commit comments

Comments
 (0)