Skip to content

Commit

Permalink
Do not check Go version user is building with
Browse files Browse the repository at this point in the history
This was I guess to stop builds pre Go 1.7 but that is very old
now, and the check breaks on every new Go release. I think we
can just document any requirements instead.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
  • Loading branch information
justincormack committed Oct 16, 2018
1 parent 7d8c9d0 commit 7f75b17
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions Makefile
Expand Up @@ -17,14 +17,6 @@ GOOSES = darwin linux windows
NOTARY_BUILDTAGS ?= pkcs11
NOTARYDIR := /go/src/github.com/theupdateframework/notary

GO_VERSION := $(shell go version | grep "1\.\(7\|8\|9\|10\)\(\.[0-9]+\)*\|devel")
# check to make sure we have the right version. development versions of Go are
# not officially supported, but allowed for building

ifeq ($(strip $(GO_VERSION))$(SKIPENVCHECK),)
$(error Bad Go version - please install Go >= 1.7)
endif

# check to be sure pkcs11 lib is always imported with a build tag
GO_LIST_PKCS11 := $(shell go list -tags "${NOTARY_BUILDTAGS}" -e -f '{{join .Deps "\n"}}' ./... | grep -v /vendor/ | xargs go list -e -f '{{if not .Standard}}{{.ImportPath}}{{end}}' | grep -q pkcs11)
ifeq ($(GO_LIST_PKCS11),)
Expand Down

0 comments on commit 7f75b17

Please sign in to comment.