Skip to content

Commit

Permalink
build: check out submodules before building UI protobufs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
benesch committed Aug 22, 2018
1 parent 8219199 commit c34d453
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,$^) >> $@
Expand Down

0 comments on commit c34d453

Please sign in to comment.