From c759a98f9a99477d5aa66815efbfa290332150f8 Mon Sep 17 00:00:00 2001 From: Paige Patton <64206430+paigerube14@users.noreply.github.com> Date: Tue, 21 Apr 2026 13:09:46 -0500 Subject: [PATCH] fix(needs-rebase): retry mergeable check on push events to catch conflicting PRs (#1240) With maxAttempts=1, all PRs have mergeable=null immediately after a push and are skipped. PRs that are never subsequently updated (no new commits, no re-opens) never get rechecked. Increasing to 3 attempts (5s + 10s backoff) gives GitHub ~15s to compute mergeability before giving up. Signed-off-by: Paige Patton Co-authored-by: Claude Sonnet 4.6 --- .github/workflows/needs-rebase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/needs-rebase.yml b/.github/workflows/needs-rebase.yml index ba51d79c..20f7efb5 100644 --- a/.github/workflows/needs-rebase.yml +++ b/.github/workflows/needs-rebase.yml @@ -168,7 +168,7 @@ jobs: for (let i = 0; i < prs.length; i += CONCURRENCY) { const batch = prs.slice(i, i + CONCURRENCY); await Promise.all(batch.map(pr => - handlePR(pr.number, pr.user.login, 1).catch(e => + handlePR(pr.number, pr.user.login, 3).catch(e => core.warning(`PR #${pr.number}: unexpected error — ${e.message}`) ) ));