From 72e4b1b4e31c9be06b200c2fe5732d4c184d526a Mon Sep 17 00:00:00 2001 From: Ling Huang Date: Mon, 9 Sep 2019 10:49:22 -0400 Subject: [PATCH] Revert "Revert "Set GO111MODULE for go and promu commands, so that they work under GOPATH. (#158)" (#166)" This reverts commit 92d4183b52ada69f267c7b4d6b7464f9cbf2d2ed. --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5fbe4b5d..c62566b2 100644 --- a/Makefile +++ b/Makefile @@ -67,23 +67,23 @@ endif test-short: @echo ">> running short tests" - $(GO) test -short $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) test -short $(GOOPTS) $(pkgs) test: @echo ">> running all tests" - $(GO) test $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) test $(GOOPTS) $(pkgs) cover: @echo ">> running all tests with coverage" - $(GO) test -coverprofile=coverage.out $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) test -coverprofile=coverage.out $(GOOPTS) $(pkgs) format: @echo ">> formatting code" - $(GO) fmt $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) fmt $(pkgs) vet: @echo ">> vetting code" - $(GO) vet $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) vet $(GOOPTS) $(pkgs) staticcheck: $(STATICCHECK) @echo ">> running staticcheck" @@ -98,11 +98,11 @@ endif build: promu @echo ">> building binaries" - $(PROMU) build --prefix $(PREFIX) + GO111MODULE=$(GO111MODULE) $(PROMU) build --prefix $(PREFIX) build-linux-amd64: promu @echo ">> building linux amd64 binaries" - @GOOS=linux GOARCH=amd64 $(PROMU) build --prefix $(PREFIX) + @GO111MODULE=$(GO111MODULE) GOOS=linux GOARCH=amd64 $(PROMU) build --prefix $(PREFIX) tarball: promu @echo ">> building release tarball"