Merge remote-tracking branch 'origin/dev' into feature/rbtree-absraction

uber · Nov 29, 2016 · 5e842da · 5e842da
2 parents 20a4910 + cc3ae2e
commit 5e842da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: go
 go:
   - 1.7
   - 1.6
-  - 1.5
 
 addons:
   apt:
@@ -21,9 +20,8 @@ install:
   - make setup
 
 env:
-  - RUN="make test-unit test-examples lint coveralls"
+  - RUN="make test-unit test-race test-examples lint coveralls"
   - RUN="make test-integration"
-  - RUN="make test-race"
 
 matrix:
   fast_finish: true

diff --git a/Makefile b/Makefile
@@ -47,8 +47,8 @@ mocks:
 	test/gen-testfiles
 
 dev_deps:
-	go get github.com/uber/tchannel-go/thrift/thrift-gen
-	./scripts/go-get-version.sh github.com/golang/lint/golint/.../@c6242afa
+	go get -u github.com/uber/tchannel-go/thrift/thrift-gen
+	go get -u github.com/golang/lint/golint/...
 	./scripts/go-get-version.sh github.com/vektra/mockery/.../@130a05e
 
 setup: dev_deps