JMR-devandClaude Opus 4.8
05d06eb45b
End the merge cascade and give the traffic-controller ownership of CI *triggering*. - autoupdate.yml updates PR branches with the built-in GITHUB_TOKEN instead of a PAT, so an update push no longer auto-retriggers CI (GitHub's anti-recursion rule) — the cascade (every merge re-runs every PR, cancel-in-progress thrashing them) is gone. - New scheduler ci-trigger.yml -> traffic_control.py --mode trigger (re-)triggers CI for the highest-priority PR(s) whose head SHA has absent/stale checks, a few at a time (inflight cap), in the existing P0-P9 / broken-draft priority order — a poor-man's merge queue reusing the priority core. It runs after autoupdate finishes (workflow_run, race-free) plus a cron backstop plus manual dispatch. - Triggering uses workflow_dispatch, which is EXEMPT from anti-recursion, so the built-in GITHUB_TOKEN (actions: write) starts the run — NO PAT / secret change needed. - ci.yml gains a workflow_dispatch trigger (pr/head_sha/reason inputs) and a per-PR concurrency group unifying pull_request and dispatch runs; its on: pull_request path is kept so brand-new PRs, human pushes, and fork PRs always get CI (fail-open). Pure select_triggers / classify_sha_runs decision core added to traffic_control.py with 24 new unit tests (priority order, oldest-first fairness, inflight cap, fork skip, P0 bypass+preempt, head-SHA needy classification, and a liveness/anti-starvation simulation). Closes #349 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
51 lines
2.1 KiB
YAML
51 lines
2.1 KiB
YAML
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
name: Auto-update PR branches
|
|
|
|
# When main advances, rebase every open PR that has fallen behind, so the "require
|
|
# branches up to date" branch rule doesn't need manual branch updates. All open PRs are
|
|
# touched (PR_FILTER: all) — this is no longer limited to PRs with GitHub auto-merge
|
|
# enabled.
|
|
#
|
|
# IMPORTANT (issue #349): the branch update runs with the default GITHUB_TOKEN — ON PURPOSE.
|
|
# A GITHUB_TOKEN push does NOT start new workflow runs (GitHub's anti-recursion rule), so
|
|
# updating every behind PR here NO LONGER re-triggers every PR's CI. That deliberately breaks
|
|
# the old merge-cascade (every merge -> autoupdate rebases all PRs with a PAT -> all re-run ->
|
|
# ci.yml's cancel-in-progress kills each in-flight run -> PRs thrash and can't converge).
|
|
# Branches still go up to date (satisfying "require branches up to date"); they just don't
|
|
# auto-run CI on the new head SHA. Re-triggering that SHA's CI is now OWNED by the traffic-
|
|
# controller scheduler (`.github/workflows/ci-trigger.yml` -> `traffic_control.py --mode
|
|
# trigger`), which triggers the updated PRs deliberately, in priority order, a few at a time.
|
|
# So this workflow must NOT use the PAT for the update push (that would re-introduce the
|
|
# cascade). The AUTOUPDATE_TOKEN secret is no longer needed by this workflow.
|
|
|
|
on:
|
|
push:
|
|
branches: [main]
|
|
pull_request:
|
|
types: [opened, reopened, ready_for_review]
|
|
branches: [main]
|
|
|
|
permissions:
|
|
contents: write
|
|
pull-requests: write
|
|
|
|
concurrency:
|
|
group: autoupdate-${{ github.ref }}
|
|
cancel-in-progress: true
|
|
|
|
jobs:
|
|
autoupdate:
|
|
name: Auto-update open PRs
|
|
runs-on: ubuntu-latest
|
|
environment: CI_CD
|
|
steps:
|
|
- name: Update all behind PRs
|
|
uses: chinthakagodawita/autoupdate@0707656cd062a3b0cf8fa9b2cda1d1404d74437e # v1.7.0
|
|
env:
|
|
# Default GITHUB_TOKEN — NOT a PAT — so this update push does not auto-retrigger CI
|
|
# (anti-recursion). See the header: re-triggering is owned by ci-trigger.yml.
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
PR_FILTER: "all"
|
|
PR_READY_STATE: "all"
|
|
MERGE_CONFLICT_ACTION: "ignore"
|