Skip to content

chore: Run address extraction first to be able to resolve conflicts (if any) #1413

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
fusmanii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: Run address extraction first to be able to resolve conflicts (if any) #1413

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
29 changes: 16 additions & 13 deletions scripts/preCommitHook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@
# Store staged rust files for later use in rustfmt as pretty-quick might revert some changes
STAGED_RUST_FILES=$(git diff --cached --name-only --diff-filter=d | grep '\.rs$')

# Regenerate deployed-addresses.{json,md} from broadcast data up front so that pretty-quick
# formats the fresh files (and merge-conflicted or deleted versions get rebuilt cleanly).
echo "Running extract-addresses on staged files ..."
yarn extract-addresses
EXTRACT_ADDRESSES_EXIT=$?
if [ $EXTRACT_ADDRESSES_EXIT -ne 0 ]; then
echo "extract-addresses encountered an error. Aborting the hook."
exit $EXTRACT_ADDRESSES_EXIT
fi
if [ -f broadcast/deployed-addresses.json ]; then
git add broadcast/deployed-addresses.json
fi
if [ -f broadcast/deployed-addresses.md ]; then
git add broadcast/deployed-addresses.md
fi

echo "Running pretty-quick on staged files ..."

yarn pretty-quick --staged
Expand Down Expand Up @@ -51,16 +67,3 @@ if [ -f generated/constants.json ]; then
git add generated/constants.json
fi

echo "Running extract-addresses on staged files ..."
yarn extract-addresses && yarn prettier --write broadcast/deployed-addresses.json && yarn prettier --write broadcast/deployed-addresses.md
EXTRACT_ADDRESSES_EXIT=$?
if [ $EXTRACT_ADDRESSES_EXIT -ne 0 ]; then
echo "extract-addresses encountered an error. Aborting the hook."
exit $EXTRACT_ADDRESSES_EXIT
fi
if [ -f broadcast/deployed-addresses.json ]; then
git add broadcast/deployed-addresses.json
fi
if [ -f broadcast/deployed-addresses.md ]; then
git add broadcast/deployed-addresses.md
fi
Loading