travis: add go1.6 and work around golint

vbatts · vbatts · commit cb02ebd927f2 · 2016-03-21T10:54:37.000-04:00
closes #350 Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: go
 go:
+  - 1.6
   - 1.5.3
   - 1.4.3
   - 1.3.3
@@ -8,13 +9,13 @@ sudo: false
 
 before_install:
   - go get golang.org/x/tools/cmd/vet
-  - go get github.com/golang/lint/golint
+  - go version | (grep -q 'go1.[56]' || exit 0 && go get -u github.com/golang/lint/golint )
   - go get github.com/vbatts/git-validation
 
 install: true
 
 script:
   - go vet -x ./...
-  - $HOME/gopath/bin/golint ./...
+  - go version | (grep -q 'go1.[56]' || exit 0 && $HOME/gopath/bin/golint ./...)
   - $HOME/gopath/bin/git-validation -run DCO,short-subject -v -range ${TRAVIS_COMMIT_RANGE}
   
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ test: .govet .golint .gitvalidation
 
 # `go get github.com/golang/lint/golint`
 .golint:
-	golint ./...
+	(go version | grep -q 'go1.[56]' || exit 0 && golint ./...)
 
 # `go get github.com/vbatts/git-validation`
 .gitvalidation:
