Skip to content

chore: fix proto script file handling and safety #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdqst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: fix proto script file handling and safety #977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions scripts/protocgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ set -eo pipefail

protoc_install_proto_gen_doc() {
echo "Installing protobuf protoc-gen-doc plugin"
(go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest 2> /dev/null)
go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest 2>/dev/null
}

echo "Generating gogo proto code"
cd proto
proto_dirs=$(find ./ -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
for dir in $proto_dirs; do
for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do
echo $file
if grep "option go_package" $file &> /dev/null ; then
buf generate --template buf.gen.gogo.yml $file
fi
done
cd proto || exit 1
find . -name '*.proto' -print0 | while IFS= read -r -d '' file; do
echo "$file"
if grep -q "option go_package" "$file"; then
buf generate --template buf.gen.gogo.yml "$file"
fi
done

#protoc_install_proto_gen_doc
Expand All @@ -27,5 +24,6 @@ done
cd ..

# move proto files to the right places
mkdir -p x
Copy link
Collaborator

@pr0n00gler pr0n00gler Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it makes sense to create the x folder, it must always be here.

cp -r github.com/neutron-org/neutron/v8/x/* x/
rm -rf github.com
rm -rf github.com/neutron-org
Copy link
Collaborator

@pr0n00gler pr0n00gler Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This command will not remove the github.com directory itself, so it doesn't make sense to narrow the command down to neutron-org