Update common Prometheus files

Signed-off-by: prombot <prometheus-team@googlegroups.com>

diff --git a/Makefile.common b/Makefile.common
index 6c8e3e2197976f1a30ad1039e9e1136337a01e2d..7642c4485c1237bb3596041be3f4a9669f80fc16 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -58,16 +58,19 @@ endif
 PROMU_VERSION ?= 0.13.0
 PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
 
+SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.45.2
+GOLANGCI_LINT_VERSION ?= v1.49.0
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
        ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
                # If we're in CI and there is an Actions file, that means the linter
                # is being run in Actions, so we don't need to run it here.
-               ifeq (,$(CIRCLE_JOB))
+               ifneq (,$(SKIP_GOLANGCI_LINT))
+                       GOLANGCI_LINT :=
+               else ifeq (,$(CIRCLE_JOB))
                        GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
                else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
                        GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint