chore: merge target branch before commit changes #3406
Conversation
| git checkout "${target_branch}" | ||
| git checkout "${current_branch}" | ||
| # only allow fast-forward merging; exit with non-zero result if there's merging | ||
| # conflict. | ||
| if [[ $(git merge -m "chore: merge ${target_branch} into ${current_branch}" "${target_branch}") -ne 0 ]]; then |
There was a problem hiding this comment.
Another way is to always update the branch to main before updating in https://github.com/googleapis/sdk-platform-java/blob/main/.github/scripts/update_googleapis_commit.sh, so that we don't have to deal with potential conflict.
There was a problem hiding this comment.
Hmm, maybe change in update_googleapis_commit.sh is better because we only want to merge main in generation PR and other pull requests need manual merge anyway.
product-auto-label
bot
added
size: s
| git commit -m "${title}" | ||
| fi | ||
|
|
||
| unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l) |
There was a problem hiding this comment.
What is this unpushed commit check meant to ensure? I'm not familiar enough with the cherry-pick subcommands
There was a problem hiding this comment.
After this change, we may have up to two commits: merge commit and change commit.
We want to exit the script if no commit happens (otherwise this will be a infinite loop). git cherry is a way to find whether the local branch has commits that are not in the remote branch. If we find any such commit, push them to remote branch.
There was a problem hiding this comment.
Makes sense, thanks. Maybe a small comment in this line may help others as well on how this ensures the remote is synced?
| git commit -m "${title}" | ||
| fi | ||
|
|
||
| unpushed_commit=$(git cherry -v "origin/${current_branch}" | wc -l) |
There was a problem hiding this comment.
Makes sense, thanks. Maybe a small comment in this line may help others as well on how this ensures the remote is synced?
|
|
In this PR:
Example run: https://github.com/googleapis/sdk-platform-java/actions/runs/12148752357/job/33877902009