Skip to content

Commit e84e8c5

Browse files
authored
Fix auto-merge script (#1074)
1 parent d47dedb commit e84e8c5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build-scripts/hack/auto-merge-successful-pr.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ def check_pr_passed(pr_number) -> bool:
2828
"""Check if all status checks passed for the given PR."""
2929
checks_json = sh(f"gh pr checks {pr_number} --json bucket")
3030
checks = json.loads(checks_json)
31-
return all(check["bucket"] == "pass" for check in checks)
31+
return all(check["bucket"] in ["pass", "skipping"] for check in checks)
3232

3333

3434
def approve_and_merge_pr(pr_number) -> None:
3535
"""Approve and merge the PR."""
36-
print(APPROVE_MSG.format(pr_number) + "Proceeding with merge...")
37-
sh(f'gh pr review {pr_number} --comment -b "{APPROVE_MSG.format(pr_number)}"')
36+
print(APPROVE_MSG.format(pr_number) + " Proceeding with merge...")
37+
sh(f'gh pr review {pr_number} --approve -b "{APPROVE_MSG.format(pr_number)}"')
3838
sh(f"gh pr merge {pr_number} --admin --squash")
3939

4040

0 commit comments

Comments
 (0)