From c34d4534f10490df5acdadacf68a2b2c27dd316a Mon Sep 17 00:00:00 2001 From: Nikhil Benesch Date: Wed, 15 Aug 2018 11:44:04 -0400 Subject: [PATCH] build: check out submodules before building UI protobufs Building UI protobufs indirectly requires that submodules have been checked out, as the Raft protobuf lives in the vendor submodule. Fix #28593. Release note: None --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d82c46e1c246..2ce257568031 100644 --- a/Makefile +++ b/Makefile @@ -301,6 +301,7 @@ bin/.bootstrap: $(GITHOOKS) Gopkg.lock | bin/.submodules-initialized ./vendor/golang.org/x/tools/cmd/stringer touch $@ +.SECONDARY: bin/.submodules-initialized bin/.submodules-initialized: ifneq ($(GIT_DIR),) git submodule update --init --recursive @@ -1079,7 +1080,7 @@ bin/.cpp_ccl_protobuf_sources: $(PROTOC) $(CPP_PROTOS_CCL) .SECONDARY: $(UI_JS_OSS) $(UI_JS_CCL) $(UI_JS_CCL): $(JS_PROTOS_CCL) -$(UI_JS_OSS) $(UI_JS_CCL): $(GW_PROTOS) pkg/ui/yarn.installed +$(UI_JS_OSS) $(UI_JS_CCL): $(GW_PROTOS) pkg/ui/yarn.installed | bin/.submodules-initialized # Add comment recognized by reviewable. echo '// GENERATED FILE DO NOT EDIT' > $@ $(PBJS) -t static-module -w es6 --strict-long --keep-case --path pkg --path ./vendor/github.com --path $(GOGO_PROTOBUF_PATH) --path $(COREOS_PATH) --path $(GRPC_GATEWAY_GOOGLEAPIS_PATH) $(filter %.proto,$^) >> $@