From 5b37794e6be08ff5fd7036320c7c47edbba043c3 Mon Sep 17 00:00:00 2001 From: prombot Date: Sat, 20 Jul 2019 00:01:36 +0000 Subject: [PATCH 1/2] makefile: update Makefile.common with newer version Signed-off-by: prombot --- Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 48d2ff8..db98993 100644 --- 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)) From 6bcb2c8adfe191b8b433f9eee24a1b9be0bea708 Mon Sep 17 00:00:00 2001 From: beorn7 Date: Mon, 22 Jul 2019 15:45:59 +0200 Subject: [PATCH 2/2] Make lint only run on 1.11 and higher Signed-off-by: beorn7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9536ebc..dd2be4a 100644 --- 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