This is an automated email from the ASF dual-hosted git repository.
pan3793 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 7e2a40786bd9 [MINOR][INFRA] Skip JIRA prompt when merging MINOR PRs
7e2a40786bd9 is described below
commit 7e2a40786bd9dd68558f2b43433e6bb9ac6d8f88
Author: Cheng Pan <[email protected]>
AuthorDate: Thu Aug 13 16:37:06 2026 +0800
[MINOR][INFRA] Skip JIRA prompt when merging MINOR PRs
### What changes were proposed in this pull request?
Update `dev/merge_spark_pr.py` to skip the "Would you like to update an
associated JIRA?" prompt when merging a MINOR PR.
### Why are the changes needed?
MINOR PRs have no associated JIRA ticket, so there is nothing to resolve
after merging. The script still prompts to update an associated JIRA, which is
unnecessary and must be dismissed manually for every MINOR merge.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
`python3 -m doctest dev/merge_spark_pr.py`
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Deepseek V4 Pro
Closes #57983 from pan3793/skip-minor-jira-prompt.
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
dev/merge_spark_pr.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 053aa5d919be..73258ff3816b 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -1749,6 +1749,7 @@ def main():
# Normalized PR-title component tags, used later to reconcile JIRA
components. Empty for
# Revert/Reapply PRs, whose titles are kept verbatim and not parsed for
components.
title_components: List[str] = []
+ is_minor = False
# Revert and Reapply PRs keep their title verbatim.
if not (is_revert_pr or is_reapply_pr):
@@ -1757,6 +1758,7 @@ def main():
parsed = Title.parse(title)
except ValueError as e:
fail("Malformed PR title: %s" % e)
+ is_minor = "MINOR" in parsed.leading
# Normalize component tags via the registry and track primary.
components = []
@@ -1907,7 +1909,10 @@ def main():
post_merge_comment(pr_num, picked_commits)
# Backport mode may be the first chance to resolve a JIRA after an
interrupted
# original merge. If it was already resolved, add any newly
inferred fix versions.
- update_jira_for_pr(pr_num, title, picked_refs, title_components,
allow_resolved=True)
+ if not is_minor:
+ update_jira_for_pr(
+ pr_num, title, picked_refs, title_components,
allow_resolved=True
+ )
sys.exit(0)
if not bool(pr["mergeable"]):
@@ -2023,7 +2028,8 @@ def main():
post_merge_comment(pr_num, merged_commits)
# This is deliberately in the finally block: once the target branch
has been pushed,
# cancelling a later cherry-pick must not bypass the mandatory JIRA
update.
- update_jira_for_pr(pr_num, title, merged_refs, title_components)
+ if not is_minor:
+ update_jira_for_pr(pr_num, title, merged_refs, title_components)
if __name__ == "__main__":
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
