cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #303211 from risicle/ris-check-cherry-picks-empty-lines

Browse source 
check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches
This commit is contained in:
Thomas Gerbet 2024-04-10 23:57:54 +02:00 committed by GitHub
commit b607b9427a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
maintainers/scripts/check-cherry-picks.sh
View file

@ -12,6 +12,9 @@ PICKABLE_BRANCHES=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.?
problem=0 problem=0
while read new_commit_sha ; do while read new_commit_sha ; do
if [ -z "$new_commit_sha" ] ; then
continue # skip empty lines
fi
if [ "$GITHUB_ACTIONS" = 'true' ] ; then if [ "$GITHUB_ACTIONS" = 'true' ] ; then
echo "::group::Commit $new_commit_sha" echo "::group::Commit $new_commit_sha"
else else
@ -57,6 +60,8 @@ while read new_commit_sha ; do
$range_diff_common --color $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 problem=1
else else
echo " ✔ $original_commit_sha highly similar to $new_commit_sha" echo " ✔ $original_commit_sha highly similar to $new_commit_sha"