This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new ba4f1bb2f [CELEBORN-931][INFRA] Fix merged pull requests resolution
ba4f1bb2f is described below
commit ba4f1bb2fe9fe0b527b7769d76605b26e9fd106d
Author: Kent Yao <[email protected]>
AuthorDate: Wed Aug 30 09:51:34 2023 +0800
[CELEBORN-931][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 you mind later for backporting
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
tested locally
Closes #1862 from yaooqinn/CELEBORN-931.
Authored-by: Kent Yao <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
dev/merge_pr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/merge_pr.py b/dev/merge_pr.py
index 67f410549..35c4602a9 100755
--- a/dev/merge_pr.py
+++ b/dev/merge_pr.py
@@ -582,9 +582,9 @@ 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.
+ # Instead, they're closed by committers.
merge_commits = [
- e for e in pr_events if e["actor"]["login"] == "asfgit" and e["event"]
== "closed"
+ e for e in pr_events if e["event"] == "closed" and e["commit_id"] is
not None
]
if merge_commits:
