From 8c3fef45fd713ffb3fa438d94386caaf5a5b7076 Mon Sep 17 00:00:00 2001 From: njuettner Date: Fri, 22 Nov 2019 14:35:01 +0100 Subject: [PATCH 1/2] Updating golangci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mikkel Oscar Lyderik Larsen Signed-off-by: Nick Jüttner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a43b7a7..37505e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ go: - "1.13.x" env: -- GO111MODULE=on GOLANGCI_RELEASE="v1.16.0" +- GO111MODULE=on GOLANGCI_RELEASE="v1.21.0" before_install: - GO111MODULE=off go get github.com/mattn/goveralls From 8f9277258c3612bbb11489a874dd97b1dd10208e Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Mon, 25 Nov 2019 10:55:38 +0100 Subject: [PATCH 2/2] Increase timeout for golangci-lint Signed-off-by: Mikkel Oscar Lyderik Larsen --- .travis.yml | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37505e3..047278f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ before_install: - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_RELEASE} script: - - make check - make test - make build.docker + - make check - roveralls - goveralls -v -coverprofile=roveralls.coverprofile -service=travis-ci diff --git a/Makefile b/Makefile index 6c1ac9d..7f22d68 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,8 @@ test: go test -v $(GOPKGS) check: - golangci-lint run ./... + go mod download + golangci-lint run --timeout=2m ./... build.local: build/$(BINARY) build.linux: build/linux/$(BINARY)