[CI] Fix /ci run reporting a failed merge on fork PRs (#61684)

Signed-off-by: khluu <khluu000@gmail.com>
This commit is contained in:
Kevin H. Luu
2026-10-14 15:26:15 -07:00
committed by GitHub
parent a4d553a46a
commit 4b61f300c0
2 changed files with 31 additions and 3 deletions
+13 -3
View File
@@ -861,14 +861,24 @@ def merge_base_into_pr(
for _ in range(BRANCH_UPDATE_POLL_ATTEMPTS):
time.sleep(BRANCH_UPDATE_POLL_SECONDS)
current_pr = github.get_pr(pr["number"])
if current_pr["head"]["sha"] != pr["head"]["sha"]:
break
if current_pr["head"]["sha"] == pr["head"]["sha"]:
continue
try:
behind = github.get_commits_behind_base(
base_ref, current_pr["head"]["sha"]
)
except ApiError as error:
# A fork's new head is briefly unknown to the base repository.
if error.status == 404:
continue
raise
break
else:
raise merge_failed("the merge commit did not appear in time")
if (
current_pr["state"] != "open"
or current_pr["base"]["ref"] != base_ref
or github.get_commits_behind_base(base_ref, current_pr["head"]["sha"])
or behind
):
raise merge_failed("the PR changed during the merge")
except ApiError as error: