[#101] Fix make test
All checks were successful
DCO action / DCO (pull_request) Successful in 43s
Tests and linters / Tests (1.19) (pull_request) Successful in 34s
Tests and linters / Tests (1.20) (pull_request) Successful in 38s
Tests and linters / Lint (pull_request) Successful in 57s
Tests and linters / Tests with -race (pull_request) Successful in 1m5s

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2024-08-08 18:02:30 +03:00
parent 280d052cef
commit a0a9b765f3
2 changed files with 5 additions and 5 deletions

View file

@ -61,10 +61,10 @@ protoc:
make protoc-install; \ make protoc-install; \
fi fi
# Protoc generate # Protoc generate
@for f in `find . -type f -name '*.proto'`; do \ @for f in `find . -type f -name '*.proto' -not -path './bin/*'`; do \
echo "⇒ Processing $$f "; \ echo "⇒ Processing $$f "; \
$(PROTOC_DIR)/bin/protoc \ $(PROTOC_DIR)/bin/protoc \
--proto_path=.:/usr/local/include \ --proto_path=.:$(PROTOC_DIR)/include:/usr/local/include \
--plugin=protoc-gen-go=$(PROTOC_GEN_GO_DIR)/protoc-gen-go \ --plugin=protoc-gen-go=$(PROTOC_GEN_GO_DIR)/protoc-gen-go \
--go_out=. --go_opt=paths=source_relative \ --go_out=. --go_opt=paths=source_relative \
--go-grpc_opt=require_unimplemented_servers=false \ --go-grpc_opt=require_unimplemented_servers=false \

View file

@ -10,7 +10,7 @@ API_PATH=$1
# MOVE FILES FROM API REPO # MOVE FILES FROM API REPO
cd "$API_PATH" || exit 1 cd "$API_PATH" || exit 1
ARGS=$(find ./ -name '*.proto') ARGS=$(find ./ -name '*.proto' -not -path './bin/*')
for file in $ARGS; do for file in $ARGS; do
dir=$(dirname "$file") dir=$(dirname "$file")
mkdir -p "$API_GO_PATH/$dir/grpc" mkdir -p "$API_GO_PATH/$dir/grpc"
@ -19,7 +19,7 @@ done
# MODIFY FILES # MODIFY FILES
cd "$API_GO_PATH" || exit 1 cd "$API_GO_PATH" || exit 1
ARGS2=$(find ./ -name '*.proto') ARGS2=$(find ./ -name '*.proto' -not -path './bin/*')
for file in $ARGS2; do for file in $ARGS2; do
echo "$file" echo "$file"
sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"\1\/grpc\/\2\.proto\";/" $file sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"\1\/grpc\/\2\.proto\";/" $file
@ -30,7 +30,7 @@ cd "$API_GO_PATH" || exit 1
make protoc make protoc
# REMOVE PROTO DEFINITIONS # REMOVE PROTO DEFINITIONS
ARGS=$(find ./$prefix -name '*.proto' -not -path './util/*') ARGS=$(find ./$prefix -name '*.proto' -not -path './util/*' -not -path './bin/*')
for file in $ARGS; do for file in $ARGS; do
rm "$file" rm "$file"
done done