Skip to content

fix(ci): stop auto-update workflow racing on merge push #1811

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

Merged
LucasSantana-Dev merged 2 commits into from
Jul 12, 2026
Merged

fix(ci): stop auto-update workflow racing on merge push #1811

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd75a2d
fix(ci): stop auto-update workflow racing on merge push
LucasSantana-Dev Jul 12, 2026
73e3ae6
Merge branch 'main' into fix/auto-update-workflow-race
LucasSantana-Dev Jul 12, 2026
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
11 changes: 11 additions & 0 deletions .github/workflows/auto-update-pr-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ name: Auto-update PR branches
on:
push:
branches: [main]
# Backstop: the push trigger fires the instant main advances, but GitHub often
# hasn't recomputed the other PRs' mergeStateStatus yet (it reads UNKNOWN, not
# BEHIND), so a merge-triggered run can update zero PRs and strand the queue
# with no further push to re-fire it. This cron catches any stranded PR within
# ~15 min regardless of the race.
schedule:
- cron: "*/15 * * * *"
workflow_dispatch:

permissions:
Expand All @@ -36,6 +43,10 @@ jobs:
REPO: ${{ github.repository }}
run: |
set -euo pipefail
# On a merge push, GitHub needs a moment to recompute the queued PRs'
# mergeStateStatus to BEHIND; without this settle the list reads them
# as UNKNOWN and updates none. The cron backstop covers the rest.
if [ "${GITHUB_EVENT_NAME:-}" = "push" ]; then sleep 45; fi
gh pr list --repo "$REPO" --state open --base main \
--json number,isDraft,mergeStateStatus,autoMergeRequest \
--jq '.[]
Expand Down
Loading