Skip to content

Commit

Permalink
fix the number of commits that need to be cherry-picked for arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
Water-Melon committed Sep 26, 2024
1 parent 652ad84 commit 616c3b8
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion make-new-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 616c3b8

Please sign in to comment.