From 6b45a943a8c518dc33bc9121a6991cffcfc50c59 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 9 Jul 2019 08:46:16 +0200 Subject: [PATCH] Fix lowest possible go version to be 1.9 containers/storage needs math/bits which has been added in go 1.9, so this is now the lowest possible go version to build skopeo. We can also remove the GO15VENDOREXPERIMENT variable since this has been enabled in go 1.6 per default and removed in go 1.7. Signed-off-by: Sascha Grunert --- Makefile | 4 +--- README.md | 2 +- hack/make/test-integration | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 886ea2da..64450cba 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ .PHONY: all binary build-container docs docs-in-container build-local clean install install-binary install-completions shell test-integration .install.vndr vendor -export GO15VENDOREXPERIMENT=1 export GO111MODULE=off ifeq ($(shell uname),Darwin) @@ -157,7 +156,7 @@ test-system: build-container exit $$rc test-unit: build-container - # Just call (make test unit-local) here instead of worrying about environment differences, e.g. GO15VENDOREXPERIMENT. + # Just call (make test unit-local) here instead of worrying about environment differences $(CONTAINER_RUN) make test-unit-local BUILDTAGS='$(BUILDTAGS)' validate: build-container @@ -177,4 +176,3 @@ vendor: $(GO) mod tidy && \ $(GO) mod vendor && \ $(GO) mod verify - diff --git a/README.md b/README.md index 7c052165..9bdd93a3 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ $ sudo zypper install skopeo Otherwise, read on for building and installing it from source: -To build the `skopeo` binary you need at least Go 1.5 because it uses the latest `GO15VENDOREXPERIMENT` flag. +To build the `skopeo` binary you need at least Go 1.9. There are two ways to build skopeo: in a container, or locally without a container. Choose the one which better matches your needs and environment. diff --git a/hack/make/test-integration b/hack/make/test-integration index e8a599f1..e75635e7 100755 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -10,6 +10,5 @@ bundle_test_integration() { ( make binary-local ${BUILDTAGS:+BUILDTAGS="$BUILDTAGS"} make install - export GO15VENDOREXPERIMENT=1 bundle_test_integration ) 2>&1