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