From b612366abc32edc61e86d0fcc0f4a08cabcf5212 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 10 Apr 2024 21:59:50 +0100 Subject: [PATCH 1/2] check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches --- maintainers/scripts/check-cherry-picks.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index 082c33fe088a..6253b97f38d2 100755 --- a/maintainers/scripts/check-cherry-picks.sh +++ b/maintainers/scripts/check-cherry-picks.sh @@ -12,6 +12,9 @@ PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.? problem=0 while read new_commit_sha ; do + if [ -z "$new_commit_sha" ] ; then + continue # skip empty lines + fi if [ "$GITHUB_ACTIONS" = 'true' ] ; then echo "::group::Commit $new_commit_sha" else From dc4f2184327d7b04edda404fa8562ba5e3e17755 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 10 Apr 2024 22:15:06 +0100 Subject: [PATCH 2/2] check-cherry-picks.sh maintainer script: add clarifying message regarding differences found --- maintainers/scripts/check-cherry-picks.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index 6253b97f38d2..e7ffe2bf4c73 100755 --- a/maintainers/scripts/check-cherry-picks.sh +++ b/maintainers/scripts/check-cherry-picks.sh @@ -60,6 +60,8 @@ while read new_commit_sha ; do $range_diff_common --color + echo "Note this should not necessarily be treated as a hard fail, but a reviewer's attention should" \ + "be drawn to it and github actions have no way of doing that but to raise a 'failure'" problem=1 else echo " ✔ $original_commit_sha highly similar to $new_commit_sha"