Skip to content

Commit 031748d

Browse files
authored
Update common Prometheus files (#1213)
Signed-off-by: prombot <[email protected]>
1 parent b8b41c8 commit 031748d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Makefile.common

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,22 @@ ifneq ($(shell which gotestsum),)
5555
endif
5656
endif
5757

58-
PROMU_VERSION ?= 0.13.0
58+
PROMU_VERSION ?= 0.14.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.50.1
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)