Merge pull request #227 from QuentinPerez/update_gotty-client

Update gotty-client to 1.2.0

Author: Quentin Perez

.travis.yml

@@ -11,8 +11,6 @@ env:
 
 matrix:
   include:
-    - go: 1.3
-    - go: 1.4
     - go: 1.5     TEST_WITH_REAL_API=1
     - go: tip
   allow_failures:

Makefile

@@ -6,9 +6,6 @@ GOINSTALL ?=	$(GOCMD) install
 GOTEST ?=	$(GOCMD) test
 GOFMT ?=	gofmt -w
 GOCOVER ?=	$(GOTEST) -covermode=count -v
-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)
 
 FPM_VERSION ?=	$(shell ./dist/scw-Darwin-i386 --version | sed 's/.*v\([0-9.]*\),.*/\1/g')
 FPM_DOCKER ?=	\
@@ -31,14 +28,17 @@ SRC = cmd/scw
 PACKAGES = pkg/api pkg/commands pkg/utils pkg/cli pkg/sshcommand pkg/config pkg/scwversion pkg/pricing
 REV = $(shell git rev-parse HEAD || echo "nogit")
 TAG = $(shell git describe --tags --always || echo "nogit")
-BUILDER = scaleway-cli-builder
-ALL_GO_FILES = $(shell find . -type f -name "*.go")
-ifeq ($(VERSION_GE_1_5),true)
 LDFLAGS = "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=$(REV) \
            -X github.com/scaleway/scaleway-cli/pkg/scwversion.VERSION=$(TAG)"
-else
-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)
+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)
 endif
 
 BUILD_LIST = $(foreach int, $(SRC), $(int)_build)
@@ -73,7 +73,7 @@ $(CLEAN_LIST): %_clean:
 	$(GOCLEAN) ./$*
 $(INSTALL_LIST): %_install:
 	$(GOINSTALL) ./$*
-$(IREF_LIST): %_iref: pkg/scwversion/version.go
+$(IREF_LIST): %_iref:
 	$(GOTEST) -ldflags $(LDFLAGS) -i ./$*
 $(TEST_LIST): %_test:
 	$(GOTEST) -ldflags $(LDFLAGS) -v ./$*

README.md

@@ -1132,6 +1132,8 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* Remove go1.[34] support
+* Update gotty-client to 1.2.0
 * Improve _cs format ([#223](https://github.com/scaleway/scaleway-cli/issues/223))
 * Use `gotty-client` instead of `termjs-cli`
 * Fix: bad detection of server already started when starting a server ([#224](https://github.com/scaleway/scaleway-cli/pull/224)) - [@arianvp](https://github.com/arianvp)