From bf07afd2406aff5f0e55ca50467951f9764ff646 Mon Sep 17 00:00:00 2001 From: Andrew Richardson Date: Mon, 20 Sep 2021 17:57:24 -0400 Subject: [PATCH] Don't download sarama unless actually building mocks Previously it was downloading as soon as the Makefile was invoked, due to the inline "go list" command. Signed-off-by: Andrew Richardson --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3c85660b..03cf429e 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,6 @@ BINARY_WIN=$(BINARY_NAME)-win GOBIN := $(shell $(VGO) env GOPATH)/bin MOCKERY := $(GOBIN)/mockery -SARAMA_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/Shopify/sarama) - .DELETE_ON_ERROR: GOFILES := $(shell find . -name '*.go' -print) @@ -51,17 +49,19 @@ build-win: ${MOCKERY}: $(VGO) install github.com/vektra/mockery/cmd/mockery@latest +sarama: + $(eval SARAMA_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/Shopify/sarama)) define makemock mocks: mocks-$(strip $(1))-$(strip $(2)) -mocks-$(strip $(1))-$(strip $(2)): ${MOCKERY} +mocks-$(strip $(1))-$(strip $(2)): ${MOCKERY} sarama ${MOCKERY} --case underscore --dir $(1) --name $(2) --outpkg $(3) --output mocks/$(strip $(3)) endef $(eval $(call makemock, internal/contractregistry, ContractStore, contractregistrymocks)) $(eval $(call makemock, internal/contractregistry, RemoteRegistry, contractregistrymocks)) $(eval $(call makemock, internal/eth, RPCClient, ethmocks)) -$(eval $(call makemock, $(SARAMA_PATH), Client, saramamocks)) -$(eval $(call makemock, $(SARAMA_PATH), ConsumerGroup, saramamocks)) -$(eval $(call makemock, $(SARAMA_PATH), ConsumerGroupSession, saramamocks)) -$(eval $(call makemock, $(SARAMA_PATH), ConsumerGroupClaim, saramamocks)) +$(eval $(call makemock, $$(SARAMA_PATH), Client, saramamocks)) +$(eval $(call makemock, $$(SARAMA_PATH), ConsumerGroup, saramamocks)) +$(eval $(call makemock, $$(SARAMA_PATH), ConsumerGroupSession, saramamocks)) +$(eval $(call makemock, $$(SARAMA_PATH), ConsumerGroupClaim, saramamocks))