From a3211b73c62a9fcc13f09305bf629ef507b26d34 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 24 Jun 2019 11:15:31 +0200 Subject: Makefile: add go-get function Add a `go-get` function to the Makefile to wrap `go get -u` into a wrapper disabling go modules. Signed-off-by: Valentin Rothberg --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8dbce2b75..0ace3758e 100644 --- a/Makefile +++ b/Makefile @@ -332,11 +332,15 @@ uninstall: GIT_CHECK_EXCLUDE="./vendor" $(GOBIN)/git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..$(HEAD) .PHONY: install.tools - install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ginkgo ## Install needed tools +define go-get + env GO111MODULE=off \ + $(GO) get -u ${1} +endef + .install.vndr: .gopathok - $(GO) get -u github.com/LK4D4/vndr + $(call go-get,github.com/LK4D4/vndr) .install.ginkgo: .gopathok if [ ! -x "$(GOBIN)/ginkgo" ]; then \ @@ -345,12 +349,12 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins .install.gitvalidation: .gopathok if [ ! -x "$(GOBIN)/git-validation" ]; then \ - $(GO) get -u github.com/vbatts/git-validation; \ + $(call go-get,github.com/vbatts/git-validation); \ fi .install.gometalinter: .gopathok if [ ! -x "$(GOBIN)/gometalinter" ]; then \ - $(GO) get -u github.com/alecthomas/gometalinter; \ + $(call go-get,github.com/alecthomas/gometalinter); \ cd $(FIRST_GOPATH)/src/github.com/alecthomas/gometalinter; \ git checkout e8d801238da6f0dfd14078d68f9b53fa50a7eeb5; \ $(GO) install github.com/alecthomas/gometalinter; \ @@ -359,7 +363,7 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins .install.md2man: .gopathok if [ ! -x "$(GOBIN)/go-md2man" ]; then \ - $(GO) get -u github.com/cpuguy83/go-md2man; \ + $(call go-get,github.com/cpuguy83/go-md2man); \ fi .install.ostree: .gopathok -- cgit v1.2.3-54-g00ecf