From 074e67ad065c37811f877d8cb4f449630513d05b Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 16 Sep 2020 16:26:50 -0700 Subject: [PATCH] Makefile: fix vendor and verify-dependencies Commit a08ab87fe added these targets. Alas, the `go mod tidy` never worked, as it was written as part of `export` statement: export GO111MODULE=on \ $(GO) mod tidy && \ ... which is the same as export GO111MODULE=on $(GO) mod tidy && ... which exports a bunch of variables, such as `go`, `mod`, and `tidy`, but does not run it. The fix would be to add a semicolon after the `export` statement, but since GO111MODULE is not really needed here (maybe some older golang versions needed it?), let's just drop it. With this dropped, && does not make any sense, so drop it, too. NOTE that if someone tries GO111MODULE=off make vendor it will fail, but I guess it is expected. Signed-off-by: Kir Kolyshkin --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 916a5cc24..30adba970 100644 --- a/Makefile +++ b/Makefile @@ -126,9 +126,8 @@ validate: ci: validate test release vendor: - export GO111MODULE=on \ - $(GO) mod tidy && \ - $(GO) mod vendor && \ + $(GO) mod tidy + $(GO) mod vendor $(GO) mod verify verify-dependencies: vendor