[INFRA] Improve pull request merge tool - #7654
Conversation
|
The referenced-event fallback does not recognize merge messages generated by this script
This does not affect the first merge of a new PR or backports completed in the same script run. It affects a later invocation that uses an already-merged PR number to continue backporting. I reproduced this with the existing release-branch PR [#7116](#7116), which was merged into The merge message contains: Running the code from this PR against those events gives: find_merge_commit(7116, events)
# (None, None)Since the |
Why are the changes needed?
This ports several useful improvements from Spark's merge tool, adapted to Kyuubi's GitHub-only workflow. It makes merges and backports safer, more traceable, and less error-prone for committers.
branch-1.12, thenbranch-1.11, and skip branches already picked.(y/N).How was this patch tested?
python3 -m py_compile dev/merge_kyuubi_pr.pypython3 -m doctest dev/merge_kyuubi_pr.pyblack --check dev/merge_kyuubi_pr.pygit diff --checkWas this patch assisted by generative AI tooling?
Assisted-by: Codex:GLM 5.3