Merge #29124

29124: backport-2.1: build: check out submodules before building UI protobufs r=rolandcrosby a=benesch Backport 1/1 commits from #28627. /cc @cockroachdb/release --- 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 Co-authored-by: Nikhil Benesch <[email protected]>
cockroachdb · Aug 28, 2018 · 4d28395 · 4d28395
2 parents f9c0948 + 6476347
commit 4d28395
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -300,6 +300,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
@@ -1075,7 +1076,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,$^) >> $@