From 66453d9b4b144005616ff9cd6b7730255f2d9f3f Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Wed, 26 Mar 2025 10:51:18 +0100 Subject: [PATCH 1/2] Use grep `-E` flag instead of `-P` flag so it works on all platforms --- libevm/tooling/release/cherrypick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libevm/tooling/release/cherrypick.sh b/libevm/tooling/release/cherrypick.sh index 89ede978e81..bf47ed7407c 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 From 866069c8c5961b97ad4641828617998384380c81 Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Wed, 26 Mar 2025 10:51:43 +0100 Subject: [PATCH 2/2] Add `-S` flag to `git cherry-pick` since it doesn't always sign all commits --- libevm/tooling/release/cherrypick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libevm/tooling/release/cherrypick.sh b/libevm/tooling/release/cherrypick.sh index bf47ed7407c..c9100a39855 100755 --- a/libevm/tooling/release/cherrypick.sh +++ b/libevm/tooling/release/cherrypick.sh @@ -44,4 +44,4 @@ if [[ -z "${commits[*]// }" ]]; then # $x// removes whitespace exit 0; fi -git cherry-pick "${commits[@]}"; +git cherry-pick -S "${commits[@]}";