Merge pull request #623 from prometheus/makefile_common

Synchronize Makefile.common from prometheus/prometheus
prometheus · Jul 22, 2019 · c0d684b · c0d684b
2 parents ff1d4e2 + 5322984
commit c0d684b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,6 @@ go:
 
 script:
   - make check_license unused test-short
-  - if [[ ! $TRAVIS_GO_VERSION =~ ^1\.9\.[x0-9]+$ ]]; then make lint; fi
+  - if [[ ! $TRAVIS_GO_VERSION =~ ^1\.(9|10)\. ]]; then make lint; fi
   # Style is only checked against the latest supported Go version.
   - if [[ $TRAVIS_GO_VERSION =~ ^1\.(12)\. ]]; then make style; fi
diff --git a/Makefile.common b/Makefile.common
@@ -74,7 +74,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.16.0
+GOLANGCI_LINT_VERSION ?= v1.17.1
 # 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))