Skip to content

Commit

Permalink
Merge pull request containers#727 from mtrmac/test-skopeo-v4
Browse files Browse the repository at this point in the history
Use the correct module path in (make test-skopeo)
  • Loading branch information
mtrmac authored Oct 3, 2019
2 parents 0d2f33e + 44b988d commit f06ac5b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ test:
# the master branch of the upstream repo.
test-skopeo:
@echo === Testing skopeo build
@project_path=$$(pwd) && export GOPATH=$$(mktemp -d) && \
@project_path=$$(pwd) && project_module=$$(GO111MODULE="on" go list .) && export GOPATH=$$(mktemp -d) && \
skopeo_path=$${GOPATH}/src/github.com/containers/skopeo && \
vendor_path=$${skopeo_path}/vendor/github.com/containers/image && \
git clone -b $(SKOPEO_BRANCH) https://github.com/$(SKOPEO_REPO) $${skopeo_path} && \
cd $${skopeo_path} && \
GO111MODULE="on" go mod edit -replace github.com/containers/image=$${project_path} && \
GO111MODULE="on" go mod edit -replace $${project_module}=$${project_path} && \
make vendor && \
make BUILDTAGS="$(BUILDTAGS)" binary-local test-all-local && \
$(SUDO) make BUILDTAGS="$(BUILDTAGS)" check && \
Expand Down

0 comments on commit f06ac5b

Please sign in to comment.