From 5b8b5708ce42b04bfd76f24c9cf2dce6ebbdd9fd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 28 May 2025 18:21:33 +0200 Subject: [PATCH] ci/check-cherry-picks: improve formatting of failure reports (cherry picked from commit 3dff9c34c0e182dc6402ba94c0e4ff0c04dd0500) --- ci/check-cherry-picks.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh index 4d91502e3551..f00011915dcd 100755 --- a/ci/check-cherry-picks.sh +++ b/ci/check-cherry-picks.sh @@ -92,7 +92,8 @@ while read -r new_commit_sha ; do endgroup log warning "Difference between $new_commit_sha and original $original_commit_sha may warrant inspection:" - $range_diff_common --color + # First line contains commit SHAs, which we already printed. + $range_diff_common --color | tail -n +2 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'"