Skip to content

Commit 9980373

Browse files
authored
Update common Prometheus files (#112)
Signed-off-by: prombot <[email protected]> Signed-off-by: prombot <[email protected]>
1 parent 38afac5 commit 9980373

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Makefile.common

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,19 @@ endif
5858
PROMU_VERSION ?= 0.13.0
5959
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
6060

61+
SKIP_GOLANGCI_LINT :=
6162
GOLANGCI_LINT :=
6263
GOLANGCI_LINT_OPTS ?=
63-
GOLANGCI_LINT_VERSION ?= v1.45.2
64+
GOLANGCI_LINT_VERSION ?= v1.49.0
6465
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
6566
# windows isn't included here because of the path separator being different.
6667
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
6768
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
6869
# If we're in CI and there is an Actions file, that means the linter
6970
# 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))
7174
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
7275
else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
7376
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint

0 commit comments

Comments
 (0)