Browse Source

build: remove support for go1.4, add go1.7

fatedier 8 years ago
parent
commit
2d30a6e8a7
3 changed files with 6 additions and 7 deletions
  1. 3 3
      .travis.yml
  2. 1 1
      Makefile
  3. 2 3
      Makefile.cross-compiles

+ 3 - 3
.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

+ 1 - 1
Makefile

@@ -1,5 +1,5 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
+export GO15VENDOREXPERIMENT := 1
 
 all: build
 

+ 2 - 3
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/...