Skip to content

Revert "[SPARK-57795][INFRA][FOLLOWUP] Refine the merge summary comment in merge_spark_pr.py" #56924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengruifeng wants to merge 1 commit into from
+3 −3
Closed

Revert "[SPARK-57795][INFRA][FOLLOWUP] Refine the merge summary comment in merge_spark_pr.py" #56924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/merge_spark_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ def post_merge_comment(pr_num, merged_commits):
"- merged into %s %s/%s" % (ref, GITHUB_COMMIT_BASE, commit_hash)
for ref, commit_hash in merged_commits
]
body = "**Merge Summary:**\n" + "\n".join(lines) + "\n\n*Posted by `merge_spark_pr.py`*"
body = "**Merge summary** (posted by `merge_spark_pr.py`):\n" + "\n".join(lines)
print("Posting merge comment on PR #%s:\n%s" % (pr_num, body))
if not GITHUB_OAUTH_KEY:
print_error("GITHUB_OAUTH_KEY is not set; skipping the merge comment.")
Expand Down Expand Up @@ -560,7 +560,7 @@ def merge_pr(pr_num, target_ref, title, body, pr_repo_desc, pr_author, co_author
clean_up()
print_error("Exception while pushing: %s" % e)

merge_hash = run_cmd("git rev-parse %s" % target_branch_name).strip()
merge_hash = run_cmd("git rev-parse %s" % target_branch_name)[:8]
clean_up()
print("Pull request #%s merged!" % pr_num)
print("Merge hash: %s" % merge_hash)
Expand Down Expand Up @@ -594,7 +594,7 @@ def _do_cherry_pick(pr_num, merge_hash, pick_ref):
except Exception as e:
fail("Exception while pushing: %s" % e)

pick_hash = run_cmd("git rev-parse %s" % pick_branch_name).strip()
pick_hash = run_cmd("git rev-parse %s" % pick_branch_name)[:8]
clean_up()

print("Pull request #%s picked into %s!" % (pr_num, pick_ref))
Expand Down