Merge pull request #810 from svanharmelen/f-revert-go1.4-check
Clean up the Go 1.4 check...
This commit is contained in:
commit
7c34ce307b
8
Makefile
8
Makefile
|
@ -23,13 +23,7 @@ testrace: generate
|
||||||
|
|
||||||
updatedeps:
|
updatedeps:
|
||||||
go get -u golang.org/x/tools/cmd/stringer
|
go get -u golang.org/x/tools/cmd/stringer
|
||||||
# Go 1.4 changed the format of `go get` a bit by requiring the
|
go get -f -u -v ./...
|
||||||
# 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
|
|
||||||
|
|
||||||
generate:
|
generate:
|
||||||
go generate ./...
|
go generate ./...
|
||||||
|
|
Loading…
Reference in New Issue