Fix builds on Travis

Author: moul

.travis.yml

@@ -11,10 +11,14 @@ env:
 
 matrix:
   include:
-    - go: 1.5     TEST_WITH_REAL_API=1
-    - go: tip
+    - go:   1.5
+      env:  GO15VENDOREXPERIMENT=1 TEST_WITH_REAL_API=1
+    - go:   1.5.1
+      env:  GO15VENDOREXPERIMENT=1 TEST_WITH_REAL_API=0
+    - go:   tip
+      env:  GO15VENDOREXPERIMENT=1 TEST_WITH_REAL_API=0
   allow_failures:
-    - go: tip
+    - go:   tip
 
 
 before_install:
@@ -27,6 +31,7 @@ before_install:
 
 script:
   - env | anonuuid
+  - rm -rf Godeps/_workspace   # Remove automatic 'godep restore' from travis...
   - make build show_version
   - if [ -z "${TEST_WITH_REAL_API}" -o -z "${TRAVIS_SCALEWAY_ORGANIZATION}" ]; then make test; fi
   - if [ "${TEST_WITH_REAL_API}" -a "${TRAVIS_SCALEWAY_ORGANIZATION}" ]; then make travis_login; fi

Makefile

@@ -38,11 +38,10 @@ TAG =		$(shell git describe --tags --always || echo $(VERSION) || echo "nogit")
 LDFLAGS = "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=$(REV) \
            -X github.com/scaleway/scaleway-cli/pkg/scwversion.VERSION=$(TAG)"
 BUILDER =	scaleway-cli-builder
-ALL_GO_FILES =	$(shell find . -type f -name "*.go")
 
 # Check go version
-GOVERSIONMAJOR = $(shell $(GO) version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
-GOVERSIONMINOR = $(shell $(GO) version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
+GOVERSIONMAJOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f1)
+GOVERSIONMINOR = $(shell go version | grep -o '[1-9].[0-9]' | cut -d '.' -f2)
 VERSION_GE_1_5 = $(shell [ $(GOVERSIONMAJOR) -gt 1 -o $(GOVERSIONMINOR) -ge 5 ] && echo true)
 ifneq ($(VERSION_GE_1_5),true)
 	$(error Bad go version, please install a version greater than or equal to 1.5)
@@ -173,7 +172,7 @@ travis_login:
 .PHONY: cover
 cover: profile.out
 
-$(COVERPROFILE_LIST): $(ALL_GO_FILES)
+$(COVERPROFILE_LIST): $(SOURCES)
 	rm -f $@
 	$(GOCOVER) -ldflags $(LDFLAGS) -coverpkg=./pkg/... -coverprofile=$@ ./$(dir $@)