Merge pull request #176 from atlassian/issue-175

Some fixes and tweaks to the Travis CI config

Author: Jacobious52

.travis.yml

@@ -20,6 +20,6 @@ before_install:
 script:
   - make lint
   - make test
-  - make test-race
   - make test-vet
   - make build
+  - make docker

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build test test-race test-vet docker clean fmt lint
+.PHONY: build test test-vet docker clean fmt lint
 
 TARGET=escalator
 # E.g. set this to -v (I.e. GOCMDOPTS=-v via shell) to get the go command to be verbose
@@ -12,9 +12,6 @@ $(TARGET): $(SOURCES)
 build: $(TARGET)
 
 test:
-	go test ./... -cover
-
-test-race:
 	go test ./... -cover -race
 
 test-vet:

lint.sh

@@ -7,4 +7,5 @@ OUTPUT="$(goreturns -d -e cmd/ pkg/)"
 test -z "$OUTPUT" || ((>&2 echo -e "$OUTPUT" "\ntry running 'make fmt'") && exit 1)
 
 # golint
-golint -set_exit_status ./...
+golint -set_exit_status ./cmd/...
+golint -set_exit_status ./pkg/...