From 2d30a6e8a7e2e285c04d18ba319994a3d6a4f936 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Thu, 11 Aug 2016 17:03:19 +0800
Subject: [PATCH] build: remove support for go1.4, add go1.7

---
 .travis.yml             | 6 +++---
 Makefile                | 2 +-
 Makefile.cross-compiles | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06bab7d0..89a8b00d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ sudo: false
 language: go
 
 go:
-    - 1.4.2
-    - 1.5.3
-    - 1.6.2
+    - 1.5.4
+    - 1.6.3
+    - 1.7rc6
 
 install:
     - make
diff --git a/Makefile b/Makefile
index d1d62181..501deb01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
+export GO15VENDOREXPERIMENT := 1
 
 all: build
 
diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles
index bac83e35..2cb5ab24 100644
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@@ -1,13 +1,12 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export OLDGOPATH := $(GOPATH)
-export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
+export GO15VENDOREXPERIMENT := 1
 
 all: build
 
 build: gox app 
 
 gox:
-	GOPATH=$(OLDGOPATH) go get github.com/mitchellh/gox
+	go get github.com/mitchellh/gox
 
 app:
 	gox -osarch "darwin/386 darwin/amd64 linux/386 linux/amd64 linux/arm windows/386 windows/amd64" ./src/...