From d697456dc90adbaf68224ed7c115b38d5855e582 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Mon, 24 Jun 2019 11:29:13 +0200
Subject: migrate to go-modules

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0ace3758e..ab886fa3a 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
-- 
cgit v1.2.3-54-g00ecf