Fix (make vendor)

(export a=b command args) does not run (command args) with a=b, it sets $a to b, and marks variables $a $command $args as exported, i.e. (command args) is not run. So, before #2287 we were not actually running (go mod tidy), and now we are not running (go mod vendor). Fix that. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Apr 8, 2020 · 779025e · 779025e
1 parent ce2fc8b
commit 779025e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -142,10 +142,9 @@ vendor-in-container:
 
 .PHONY: vendor
 vendor:
-	export GO111MODULE=on \
-		$(GO) mod vendor && \
-		$(GO) mod tidy && \
-		$(GO) mod verify
+	GO111MODULE=on $(GO) mod vendor
+	GO111MODULE=on $(GO) mod tidy
+	GO111MODULE=on $(GO) mod verify
 
 .PHONY: lint
 lint: install.tools

diff --git a/tests/tools/Makefile b/tests/tools/Makefile
@@ -12,10 +12,9 @@ all: $(BUILDDIR)
 
 .PHONY: vendor
 vendor:
-	export GO111MODULE=on \
-		$(GO) mod tidy && \
-		$(GO) mod vendor && \
-		$(GO) mod verify
+	GO111MODULE=on $(GO) mod tidy
+	GO111MODULE=on $(GO) mod vendor
+	GO111MODULE=on $(GO) mod verify
 
 define go-build
 	$(shell cd `pwd` && $(GO_BUILD) -o $(BUILDDIR)/$(shell basename $(1)) $(1))