From 616c3b8c61fd0e34d593ab1de1f668d2e1fa8430 Mon Sep 17 00:00:00 2001 From: Water-Melon Date: Thu, 26 Sep 2024 15:14:16 +0800 Subject: [PATCH] fix the number of commits that need to be cherry-picked for arm64 --- make-new-release.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make-new-release.sh b/make-new-release.sh index 5acb3a18d0c4..9aecf23d4423 100755 --- a/make-new-release.sh +++ b/make-new-release.sh @@ -67,7 +67,12 @@ git checkout --no-track -b ${rel}-kvm-arm64 2>/dev/null git clean -f git pull origin ${rel}-kvm-arm64 --rebase 2>/dev/null # total of 4 commits for arm64 -for c in $(git log --reverse -n 2 --pretty=format:"%H" $last_arm64_branch); do +# for ubuntu22 `-n` should be 3, for `ubuntu24` it should be 2 +n=3 +if [ $urel -eq 24 ]; then + n=2 +fi +for c in $(git log --reverse -n $n --pretty=format:"%H" $last_arm64_branch); do cherry $c done