github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-06 17:14:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #688 from SUSE/go-version

Browse Source 
Fix lowest possible go version to be 1.9
This commit is contained in:
Valentin Rothberg 2019-07-09 11:11:18 +02:00 committed by GitHub
commit 5c1ce1e033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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 .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 export GO111MODULE=off
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
@ -157,7 +156,7 @@ test-system: build-container
exit $$rc exit $$rc
test-unit: build-container 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)' $(CONTAINER_RUN) make test-unit-local BUILDTAGS='$(BUILDTAGS)'
validate: build-container validate: build-container
@ -177,4 +176,3 @@ vendor:
$(GO) mod tidy && \ $(GO) mod tidy && \
$(GO) mod vendor && \ $(GO) mod vendor && \
$(GO) mod verify $(GO) mod verify

2
README.md
View File

@ -164,7 +164,7 @@ $ sudo zypper install skopeo
Otherwise, read on for building and installing it from source: 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. 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.

1
hack/make/test-integration
View File

@ -10,6 +10,5 @@ bundle_test_integration() {
( (
make binary-local ${BUILDTAGS:+BUILDTAGS="$BUILDTAGS"} make binary-local ${BUILDTAGS:+BUILDTAGS="$BUILDTAGS"}
make install make install
export GO15VENDOREXPERIMENT=1
bundle_test_integration bundle_test_integration
) 2>&1 ) 2>&1