From c245183101f94afcd87cea0a0274412bfa8bd00f Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 7 Jan 2016 16:34:52 +0000 Subject: [PATCH] Stop errcheck running for go < 1.5 --- .travis.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3165b0fcf..b97d2aa61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ go: install: - go get ./... - - go get -u github.com/kisielk/errcheck + - '[[ `go version` =~ go1.[0-4][^0-9] ]] || go get -u github.com/kisielk/errcheck' - go get -u golang.org/x/tools/cmd/goimports - go get -u github.com/golang/lint/golint diff --git a/Makefile b/Makefile index f1f585d61..d218135c0 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ test: rclone check: rclone go vet ./... - errcheck ./... + [[ `go version` =~ go1.[0-4][^0-9] ]] || errcheck -verbose ./... goimports -d . | grep . ; test $$? -eq 1 golint ./... | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1