mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-21 22:24:32 +00:00
fix(libevm/tooling/release): small cherrypick.sh fixes (#171)
- 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:
parent
1d75a11657
commit
7b930f19b7
1 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
|
|
@ -44,4 +44,4 @@ if [[ -z "${commits[*]// }" ]]; then # $x// removes whitespace
|
|||
exit 0;
|
||||
fi
|
||||
|
||||
git cherry-pick "${commits[@]}";
|
||||
git cherry-pick -S "${commits[@]}";
|
||||
|
|
|
|||
Loading…
Reference in a new issue