diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 11:29:13 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2019-06-24 13:20:59 +0200 |
| commit | d697456dc90adbaf68224ed7c115b38d5855e582 (patch) | |
| tree | 5fd88c48b34e7bead0028fa97e39f43f03880642 /Makefile | |
| parent | a3211b73c62a9fcc13f09305bf629ef507b26d34 (diff) | |
| download | podman-d697456dc90adbaf68224ed7c115b38d5855e582.tar.gz podman-d697456dc90adbaf68224ed7c115b38d5855e582.tar.bz2 podman-d697456dc90adbaf68224ed7c115b38d5855e582.zip | |
migrate to go-modules
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -339,9 +339,6 @@ define go-get $(GO) get -u ${1} endef -.install.vndr: .gopathok - $(call go-get,github.com/LK4D4/vndr) - .install.ginkgo: .gopathok if [ ! -x "$(GOBIN)/ginkgo" ]; then \ $(GO) build -o ${GOPATH}/bin/ginkgo ./vendor/github.com/onsi/ginkgo/ginkgo ; \ @@ -400,12 +397,11 @@ build-all-new-commits: # Validate that all the commits build on top of $(GIT_BASE_BRANCH) git rebase $(GIT_BASE_BRANCH) -x make -vendor: .install.vndr - $(GOPATH)/bin/vndr \ - -whitelist "github.com/varlink/go" \ - -whitelist "github.com/onsi/ginkgo" \ - -whitelist "github.com/onsi/gomega" \ - -whitelist "gopkg.in/fsnotify.v1" +vendor: + export GO111MODULE=on \ + $(GO) mod tidy && \ + $(GO) mod vendor && \ + $(GO) mod verify .PHONY: \ .gopathok \ |