From 7013326c0627e754950bc2d2bc2214ebadd4203d Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 15 Jan 2015 22:00:08 +0100 Subject: [PATCH 1/2] Let's clean up Go 1.4 checks... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need for these as the project will not build without Go 1.4 anyway now… --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 44922e283..74a73fc60 100644 --- a/Makefile +++ b/Makefile @@ -23,13 +23,7 @@ testrace: generate updatedeps: go get -u golang.org/x/tools/cmd/stringer - # Go 1.4 changed the format of `go get` a bit by requiring the - # canonical full path. We work around this and just force. - @if [ $(shell go version | cut -f3 -d" " | cut -f2 -d.) -lt 4 ]; then \ - go get -u -v ./...; \ - else \ - go get -f -u -v ./...; \ - fi + go get -f -u -v ./...; \ generate: go generate ./... From d823db59633e730779a63e60cbf640f80c603eea Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 15 Jan 2015 22:03:43 +0100 Subject: [PATCH 2/2] Removed obsolete chars --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 74a73fc60..4a842c937 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ testrace: generate updatedeps: go get -u golang.org/x/tools/cmd/stringer - go get -f -u -v ./...; \ + go get -f -u -v ./... generate: go generate ./...