Skip to content

fix(libevm/tooling/release): small cherrypick.sh fixes #171

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

Merged
merged 2 commits into from
Mar 26, 2025
Merged

fix(libevm/tooling/release): small cherrypick.sh fixes #171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66453d9
Use grep `-E` flag instead of `-P` flag so it works on all platforms
qdm12 Mar 26, 2025
866069c
Add `-S` flag to `git cherry-pick` since it doesn't always sign all c…
qdm12 Mar 26, 2025
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
4 changes: 2 additions & 2 deletions libevm/tooling/release/cherrypick.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set -o pipefail;

SELF_DIR=$(dirname "${0}")
# The format of the `cherrypicks` file is guaranteed by a test so we can use simple parsing here.
CHERRY_PICKS=$(< "${SELF_DIR}/cherrypicks" grep -Pv "^#" | awk '{print $1}')
CHERRY_PICKS=$(< "${SELF_DIR}/cherrypicks" grep -Ev "^#" | awk '{print $1}')

commits=()
for commit in ${CHERRY_PICKS}; do
Expand All @@ -44,4 +44,4 @@ if [[ -z "${commits[*]// }" ]]; then # $x// removes whitespace
exit 0;
fi

git cherry-pick "${commits[@]}";
git cherry-pick -S "${commits[@]}";
Loading