From cc3ae2ec02e22d78418d7515db444da1be5178f8 Mon Sep 17 00:00:00 2001
From: Nils Dijk <me@thanod.nl>
Date: Tue, 29 Nov 2016 14:07:05 +0100
Subject: [PATCH] [Travis] Remove go1.5 support (#187)

* drop go 1.5 support on travis

* consolidate tests
---
 .travis.yml | 4 +---
 Makefile    | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff90c0fa..dee6d32f 100644
--- 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
index a3d259ed..69beee8e 100644
--- 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