This is an automated email from the ASF dual-hosted git repository.
dongjoon 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 6c4ae354c53 [SPARK-45007][INFRA] Fix merged pull requests resolution
6c4ae354c53 is described below
commit 6c4ae354c53cc4ceaf13405a63485ae8da9a96fe
Author: Kent Yao <y...@apache.org>
AuthorDate: Tue Aug 29 08:21:53 2023 -0700
[SPARK-45007][INFRA] Fix merged pull requests resolution
### What changes were proposed in this pull request?
This PR fixes the resolution for merged pull requests. It appears that the
user "asfgit" is no longer closing pull requests, but rather the committers are.
### Why are the changes needed?
Bugfix, make the merge script re-runnable again if you accidentally abort
cherry-pick or change your mind later for backporting.
### Does this PR introduce _any_ user-facing change?
maintainer only
### How was this patch tested?
```
>>> for e in pr_events:
... print(e["event"], e["commit_id"])
...
labeled None
labeled None
labeled None
review_requested None
review_requested None
head_ref_force_pushed None
head_ref_force_pushed None
head_ref_force_pushed None
head_ref_force_pushed None
closed 76a32d3df0fe8e857221662657936e5ae336d3ee
```
```
./dev/merge_spark_pr.py
git rev-parse --abbrev-ref HEAD
Which pull request would you like to merge? (e.g. 34): 42714
Pull request 42714 has already been merged, assuming you want to backport
['git', 'rev-parse', '--quiet', '--verify',
'76a32d3df0fe8e857221662657936e5ae336d3ee^{commit}']
Found commit 76a32d3df0fe8e857221662657936e5ae336d3ee:
.
.
.
Closes #42714 from HyukjinKwon/SPARK-45000.
Authored-by: Hyukjin Kwon <gurwls223apache.org>
Signed-off-by: Dongjoon Hyun <dhyunapple.com>
Enter a branch name [branch-3.5]:
```
### Was this patch authored or co-authored using generative AI tooling?
Closes #42722 from yaooqinn/SPARK-45007.
Authored-by: Kent Yao <y...@apache.org>
Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
dev/merge_spark_pr.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index fa66d2b2021..adda74b3f48 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -611,10 +611,8 @@ def main():
pr_repo_desc = "%s/%s" % (user_login, base_ref)
# Merged pull requests don't appear as merged in the GitHub API;
- # Instead, they're closed by asfgit.
- merge_commits = [
- e for e in pr_events if e["actor"]["login"] == "asfgit" and e["event"]
== "closed"
- ]
+ # Instead, they're closed by committers.
+ merge_commits = [e for e in pr_events if e["event"] == "closed" and
e["commit_id"] is not None]
if merge_commits:
merge_hash = merge_commits[0]["commit_id"]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
