Skip to content

Commit 7b930f1

Browse files
authored
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
1 parent 1d75a11 commit 7b930f1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libevm/tooling/release/cherrypick.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set -o pipefail;
2727

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

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

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

0 commit comments

Comments
 (0)