File tree 1 file changed +5
-2
lines changed
1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -58,16 +58,19 @@ endif
58
58
PROMU_VERSION ?= 0.13.0
59
59
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
60
60
61
+ SKIP_GOLANGCI_LINT :=
61
62
GOLANGCI_LINT :=
62
63
GOLANGCI_LINT_OPTS ?=
63
- GOLANGCI_LINT_VERSION ?= v1.45.2
64
+ GOLANGCI_LINT_VERSION ?= v1.49.0
64
65
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
65
66
# windows isn't included here because of the path separator being different.
66
67
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
67
68
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
68
69
# If we're in CI and there is an Actions file, that means the linter
69
70
# is being run in Actions, so we don't need to run it here.
70
- ifeq (,$(CIRCLE_JOB))
71
+ ifneq (,$(SKIP_GOLANGCI_LINT))
72
+ GOLANGCI_LINT :=
73
+ else ifeq (,$(CIRCLE_JOB))
71
74
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
72
75
else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
73
76
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
You can’t perform that action at this time.
0 commit comments