Merge pull request #257 from scaleway/fix-travis

Fix travis

Author: moul

Godeps/Godeps.json

@@ -53,7 +53,7 @@ INSTALL_LIST =		$(foreach int, $(COMMANDS), $(int)_install)
 IREF_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_iref)
 TEST_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_test)
 FMT_LIST =		$(foreach int, $(COMMANDS) $(PACKAGES), $(int)_fmt)
-COVERPROFILE_LIST =	$(foreach int, $(PACKAGES), $(int)/profile.out)
+COVERPROFILE_LIST =	$(foreach int, $(subst $(GODIR),./,$(PACKAGES)), $(int)/profile.out)
 
 
 .PHONY: $(CLEAN_LIST) $(TEST_LIST) $(FMT_LIST) $(INSTALL_LIST) $(BUILD_LIST) $(IREF_LIST)
@@ -150,6 +150,7 @@ gocyclo:
 
 .PHONY: godep-save
 godep-save:
+	go get github.com/tools/godep
 	$(GODEP) save $(PACKAGES) $(COMMANDS)
 
 
@@ -172,11 +173,11 @@ travis_login:
 .PHONY: cover
 cover: profile.out
 
-$(COVERPROFILE_LIST): $(SOURCES)
+$(COVERPROFILE_LIST):: $(SOURCES)
 	rm -f $@
 	$(GOCOVER) -ldflags $(LDFLAGS) -coverpkg=./pkg/... -coverprofile=$@ ./$(dir $@)
 
-profile.out: $(COVERPROFILE_LIST)
+profile.out:: $(COVERPROFILE_LIST)
 	rm -f $@
 	echo "mode: set" > $@
 	cat ./pkg/*/profile.out | grep -v mode: | sort -r | awk '{if($$1 != last) {print $$0;last=$$1}}' >> $@
@@ -193,7 +194,7 @@ travis_cleanup:
 	@if [ "$(TRAVIS_SCALEWAY_TOKEN)" -a "$(TRAVIS_SCALEWAY_ORGANIZATION)" ]; then \
 	  ./scw stop -t $(shell ./scw ps -q) || true; \
 	  ./scw rm $(shell ./scw ps -aq) || true; \
-	  ./scw rmi $(shell ./scw images -q) || true; \
+	  ./scw rmi $(shell ./scw images -f organization=me -q) || true; \
 	fi
 
 

Makefile

@@ -10,11 +10,11 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/Sirupsen/logrus"
+	"github.com/docker/go-units"
 	"github.com/scaleway/scaleway-cli/pkg/commands"
 	"github.com/scaleway/scaleway-cli/pkg/pricing"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/units"
 )
 
 var cmdBilling = &Command{

pkg/cli/x_billing.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 )
 
 // EventsArgs are arguments passed to `RunEvents`

pkg/commands/events.go

@@ -9,7 +9,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 	"github.com/scaleway/scaleway-cli/pkg/utils"
 )
 

pkg/commands/history.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 	"github.com/renstrom/fuzzysearch/fuzzy"
 	"github.com/scaleway/scaleway-cli/pkg/api"
 	"github.com/scaleway/scaleway-cli/pkg/utils"

pkg/commands/images.go

@@ -80,7 +80,7 @@ func TestRunImages_realAPI(t *testing.T) {
 
 			firstLine := lines[0]
 			colNames := strings.Fields(firstLine)
-			So(colNames, ShouldResemble, []string{"REPOSITORY", "TAG", "IMAGE", "ID", "CREATED", "VIRTUAL", "SIZE"})
+			So(colNames, ShouldResemble, []string{"REPOSITORY", "TAG", "IMAGE", "ID", "CREATED", "VIRTUAL", "SIZE", "REGION", "ARCH"})
 
 			// FIXME: test public images
 		})
@@ -101,7 +101,7 @@ func TestRunImages_realAPI(t *testing.T) {
 
 			firstLine := lines[0]
 			colNames := strings.Fields(firstLine)
-			So(colNames, ShouldResemble, []string{"REPOSITORY", "TAG", "IMAGE", "ID", "CREATED", "VIRTUAL", "SIZE"})
+			So(colNames, ShouldResemble, []string{"REPOSITORY", "TAG", "IMAGE", "ID", "CREATED", "VIRTUAL", "SIZE", "REGION", "ARCH"})
 
 			// FIXME: test public images
 			// FIXME: test bootscripts

pkg/commands/images_test.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/units"
+	"github.com/docker/go-units"
 	"github.com/renstrom/fuzzysearch/fuzzy"
 
 	"github.com/scaleway/scaleway-cli/pkg/utils"