asandikci.com/web
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Improve the bump tool so that it can cherry-pick a merge type commit

Browse source
This commit is contained in:
Cotes Chung 2021-09-16 20:12:11 +08:00
parent 4001ef7cba
commit c68a937e01
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/bump.sh
View file

@ -128,10 +128,12 @@ release() {
git checkout -b "$_release_branch" git checkout -b "$_release_branch"
_new_release_branch=true _new_release_branch=true
else else
# cherry-pick the latest commit from default branch to release branch
_last_commit="$(git rev-parse $DEFAULT_BRANCH)"
git checkout "$_release_branch" git checkout "$_release_branch"
# cherry-pick the latest commit from master branch to release branch git cherry-pick "$_last_commit" -m 1
git cherry-pick "$(git rev-parse $DEFAULT_BRANCH)"
fi fi
fi fi
echo -e "Bump version to $_version\n" echo -e "Bump version to $_version\n"