From 40dc575aa484c6bad36b2a21fe85c5d3322ef48c Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Wed, 23 Mar 2016 15:02:01 +0100 Subject: [PATCH] Update Travis CI - Only use golint if version is > Go 1.4 - Add Go 1.6 and tip as test targets. --- .travis.yml | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36c4b68c8..d2bf99a14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,14 +9,14 @@ os: go: - 1.4.2 - 1.5.3 - -# - tip + - 1.6 + - tip install: - go get -t ./... - '[[ `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 + - '[[ `go version` =~ go1.[0-4][^0-9] ]] || go get -u github.com/golang/lint/golint' script: - make check diff --git a/Makefile b/Makefile index 978b90963..7c946e27b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ check: rclone go vet ./... [[ `go version` =~ go1.[0-4][^0-9] ]] || errcheck ./... goimports -d . | grep . ; test $$? -eq 1 - golint ./... | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1 + [[ `go version` =~ go1.[0-4][^0-9] ]] || { golint ./... | grep -E -v '(StorageUrl|CdnUrl)' ; test $$? -eq 1;} doc: rclone.1 MANUAL.html MANUAL.txt