Skip to content

Commit 578aa19

Browse files
James DeFelicejdef
authored andcommitted
lib: rebuild proto/json stubs 0aa3df5147e7
make: tweak proto compiler to include WKT for duration
1 parent c24e46c commit 578aa19

File tree

13 files changed

+6664
-1872
lines changed

13 files changed

+6664
-1872
lines changed

Makefile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@ protobufs-requirements:
9595
@for i in ${REQUIRED_PROTOC_BINARIES}; do which $$i >/dev/null || { echo "failed to locate binary: $$i"; exit 1; }; done
9696

9797
.PHONY: protobufs
98+
protobufs: GOGO_OUT=Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types:.
9899
protobufs: protobufs-requirements clean-protobufs
99-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. *.proto)
100-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./scheduler/*.proto)
101-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./executor/*.proto)
102-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./agent/*.proto)
103-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./quota/*.proto)
104-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./allocator/*.proto)
105-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./maintenance/*.proto)
106-
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=. ./master/*.proto)
100+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} *.proto)
101+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./scheduler/*.proto)
102+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./executor/*.proto)
103+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./agent/*.proto)
104+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./quota/*.proto)
105+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./allocator/*.proto)
106+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./maintenance/*.proto)
107+
(cd ${API_PKG}; protoc --proto_path="${PROTO_PATH}" --gogo_out=${GOGO_OUT} ./master/*.proto)
107108

108109
.PHONY: clean-protobufs
109110
clean-protobufs:

api/v1/lib/agent/agent.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)