forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 19:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
- Use grep `-E` flag instead of `-P` flag so it works on all platforms
- Add `-S` flag to `git cherry-pick` since it doesn't always sign all commits after resolving conflicts
This commit is contained in:
Quentin McGaw 2025-03-26 11:26:10 +01:00 committed by GitHub
parent 1d75a11657
commit 7b930f19b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libevm/tooling/release/cherrypick.sh
View file

@ -27,7 +27,7 @@ set -o pipefail;
SELF_DIR=$(dirname "${0}") SELF_DIR=$(dirname "${0}")
# The format of the `cherrypicks` file is guaranteed by a test so we can use simple parsing here. # 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=() commits=()
for commit in ${CHERRY_PICKS}; do for commit in ${CHERRY_PICKS}; do
@ -44,4 +44,4 @@ if [[ -z "${commits[*]// }" ]]; then # $x// removes whitespace
exit 0; exit 0;
fi fi
git cherry-pick "${commits[@]}"; git cherry-pick -S "${commits[@]}";