File tree 1 file changed +6
-5
lines changed
1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,8 @@ IMAGE_BUILD_OPTS += $(DOCKERARGS)
36
36
37
37
# Go tools
38
38
GO = go
39
- GOLINT = $(GOBIN ) /golangci-lint
39
+ GOLANGCI_LINT_VERSION = v1.23.8
40
+ GOLANGCI_LINT = $(GOBIN ) /golangci-lint
40
41
TIMEOUT = 15
41
42
V = 0
42
43
Q = $(if $(filter 1,$V) ,,@)
@@ -65,8 +66,8 @@ $(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR)
65
66
66
67
# Tools
67
68
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 )
70
71
71
72
GOVERALLS = $(GOBIN ) /goveralls
72
73
$(GOBIN ) /goveralls : | $(BASE ) ; $(info building goveralls...)
@@ -75,9 +76,9 @@ $(GOBIN)/goveralls: | $(BASE) ; $(info building goveralls...)
75
76
# Tests
76
77
77
78
.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
79
80
$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 ; \
81
82
exit $$ ret
82
83
83
84
plugins : noop-plugin ufm-plugin ; $(info Building plugins...) # # Build plugins
You can’t perform that action at this time.
0 commit comments