Skip to content

[mergebot] Add all-green option #77660

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
zengk95 wants to merge 3 commits into from
Closed

[mergebot] Add all-green option #77660

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2af3e2
all green
zengk95 May 16, 2022
171ee2c
all green
zengk95 May 16, 2022
f04e6a9
fixed typos
zengk95 May 17, 2022
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
26 changes: 21 additions & 5 deletions .github/scripts/trymerge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ def parse_args() -> Any:
parser = ArgumentParser("Merge PR into default branch")
parser.add_argument("--dry-run", action="store_true")
parser.add_argument("--on-green", action="store_true")
parser.add_argument("--all-green", action="store_true")
parser.add_argument("--revert", action="store_true")
parser.add_argument("--force", action="store_true")
parser.add_argument("--comment-id", type=int)
Expand Down Expand Up @@ -858,7 +859,7 @@ def prefix_with_github_url(suffix_str: str) -> str:
return f"https://github.com/{suffix_str}"


def merge_on_green(pr_num: int, repo: GitRepo, dry_run: bool = False, timeout_minutes: int = 400) -> None:
def merge_on_green(pr_num: int, repo: GitRepo, dry_run: bool = False, timeout_minutes: int = 400, all_green: bool = False) -> None:
repo = GitRepo(get_git_repo_dir(), get_git_remote_name())
org, project = repo.gh_owner_and_name()
start_time = time.time()
Expand All @@ -868,10 +869,25 @@ def merge_on_green(pr_num: int, repo: GitRepo, dry_run: bool = False, timeout_mi
current_time = time.time()
elapsed_time = current_time - start_time


pr = GitHubPR(org, project, pr_num)
try:
return pr.merge_into(repo, dry_run=dry_run)
if all_green:
checks = pr.get_checkrun_conclusions()
pending_checks = []
failed_checks = []
for check in checks:
if checks[check] is None:
pending_checks.append(check)
elif checks[check] != 'SUCCESS':
failed_checks.append(check)
if len(failed_checks) > 0:
raise RuntimeError(f"Failed to merge due to failing checks, {','.join(failed_checks)}")
if len(pending_checks) > 0:
reject_reason = f"Refusing to merge as mandatory check(s) {','.join(pending_checks)} are missing"
raise MandatoryChecksMissingError(reject_reason)
pr.merge_into(repo, dry_run=dry_run)
Copy link
Contributor

@janeyx99 janeyx99 May 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, this calls the code that makes the find_matching_merge_rule. In that case go for it lol, but Eli's comment about the API limit is important since we did have SEVs about our GITHUB_TOKEN getting overused.

else:
pr.merge_into(repo, dry_run=dry_run)
except MandatoryChecksMissingError as ex:
last_exception = str(ex)
print(f"Merged failed due to: {ex}. Retrying in 60 seconds.")
Expand Down Expand Up @@ -913,9 +929,9 @@ def handle_exception(e: Exception, msg: str = "Merge failed") -> None:
gh_post_comment(org, project, args.pr_num, "Cross-repo ghstack merges are not supported", dry_run=args.dry_run)
return

if args.on_green:
if args.on_green or args._all_green:
try:
merge_on_green(args.pr_num, repo, dry_run=args.dry_run)
merge_on_green(args.pr_num, repo, dry_run=args.dry_run, all_green=args.all_green)
except Exception as e:
handle_exception(e)
else:
Expand Down