Skip to content

Commit 145dfd3

Browse files
author
Jason Yellick
committed
Do not make protos in gotools dir
The compile_protos.sh script tries to compile all protos in the fabric directory. Once the gotools dir is initialized, it contains some proto files which will fail to compile with compile_protos.sh. This change excludes the gotools directory from proto compilation. Change-Id: I8e61cedfaea3a8cbff856579d95e70d726196543 Signed-off-by: Jason Yellick <[email protected]>
1 parent 845b30e commit 145dfd3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/compile_protos.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ PROTO_ROOT_FILES="$(find . -name ".protoroot" -exec readlink -f {} \;)"
1111
PROTO_ROOT_DIRS="$(dirname $PROTO_ROOT_FILES)"
1212

1313

14-
# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder
14+
# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder, as well as the gotools dir
1515
ROOTLESS_PROTO_FILES="$(find $PWD \
1616
$(for dir in $PROTO_ROOT_DIRS ; do echo "-path $dir -prune -o " ; done) \
1717
-path $PWD/vendor -prune -o \
18+
-path $PWD/gotools -prune -o \
1819
-name "*.proto" -exec readlink -f {} \;)"
1920
ROOTLESS_PROTO_DIRS="$(dirname $ROOTLESS_PROTO_FILES | sort | uniq)"
2021

0 commit comments

Comments
 (0)