From 979d67627f8bbfba1e2b9777070864f10edab346 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Thu, 5 Feb 2015 13:19:27 -0600 Subject: [PATCH] Update for recent TravisCI changes. Also, override the struct tag checking which is broken in the latest go vet. --- .travis.yml | 6 +++--- goclean.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b44a0b1..e111f226 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ language: go go: - - go1.3 - - release + - 1.3.3 + - 1.4.1 sudo: false before_install: - gotools=golang.org/x/tools - - if [ "$TRAVIS_GO_VERSION" = "release" ] || [ "$TRAVIS_GO_VERSION" = "go1.3.3" ]; then gotools=code.google.com/p/go.tools; fi + - if [ "$TRAVIS_GO_VERSION" = "go1.3.3" ]; then gotools=code.google.com/p/go.tools; fi install: - go get -d -t -v ./... - go get -v $gotools/cmd/cover diff --git a/goclean.sh b/goclean.sh index fe2796bd..f1624600 100755 --- a/goclean.sh +++ b/goclean.sh @@ -13,7 +13,7 @@ set -e test -z $(gofmt -l -w . | tee /dev/stderr) test -z $(goimports -l -w . | tee /dev/stderr) test -z $(golint ./... | grep -v "ALL_CAPS" | grep -v "OP_" | tee /dev/stderr) -go vet ./... +go tool vet -structtags=false . env GORACE="halt_on_error=1" go test -v -race ./... # Run test coverage on each subdirectories and merge the coverage profile.