From 7b930f19b7c12552f2a21a8938ca0856d5f75812 Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Wed, 26 Mar 2025 11:26:10 +0100 Subject: [PATCH] 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 --- libevm/tooling/release/cherrypick.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libevm/tooling/release/cherrypick.sh b/libevm/tooling/release/cherrypick.sh index 89ede978e8..c9100a3985 100755 --- a/libevm/tooling/release/cherrypick.sh +++ b/libevm/tooling/release/cherrypick.sh @@ -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[@]}";