claudeandClaude Opus 5.5
ca0ee132d9
The release guard in 17d87b0 was safe but not live. Gitea 1.27.2 calls
CancelPreviousJobsByJobConcurrency whenever a job's `needs` resolve
(services/actions/clear_tasks.go:91, models/actions/run_job.go:641), so
a job's place in the `release-tag-v1` group followed when its own
selftest finished, not merge order. A newer merge C2 finishing selftest
first queued behind the older C1, C1 cancelled it, saw tip = C2, and
deferred: nobody pushed, and if merges then stopped v1 stayed stale
indefinitely behind a Skipped and a Cancelled job. The "always catches
up once merges pause" claim in ci.yaml and README was false.
What now holds:
- release-sweep.yaml runs on `schedule` every 15 minutes, in its own
workflow and concurrency group, so nothing in ci.yaml can cancel it.
When v1 already covers main's tip it stops after a checkout and one
merge-base. Otherwise it checks out the tip, runs the same shellcheck
and selftest.sh as ci.yaml's selftest job, and tags the tip only if
they pass; a failing main therefore turns the sweep red on every tick
while v1 lags, which is #27's AC1 loud-failure half. It reads the tip
itself because a scheduled run's github.sha is the CommitSHA recorded
when the schedule was registered on the last push to main
(services/actions/notifier_helper.go:569-580,
services/actions/schedule_tasks.go:126-141), and ref is the default
branch: schedules are registered only from it
(notifier_helper.go:120, :531, :603-604). event_name is "schedule"
(context.go:71 reads TriggerEvent, set at schedule_tasks.go:136).
Cron is 5-field robfig in UTC (models/actions/schedule_spec.go:38-41).
- 15 minutes, not 10: the sweep is the fallback, not the release path,
and every tick is a run on gitdan-ci's shared slots and a row in the
Actions list. 96 no-op runs a day of a few seconds each is the cost;
the lag bound it buys is one interval plus one selftest run.
- Both writers go through scripts/release-v1.sh and push with
--force-with-lease=refs/tags/v1:<v1 as read>, so v1 cannot move
backwards when the sweep and a merge job race. A lost lease re-reads
v1: at or ahead of this run's gated commit is a clean skip (the other
writer released something at least as new); still behind it is a
retry leased on the new value, up to three attempts, since the other
writer may have tagged an older commit and giving up there would leave
v1 short of a commit this run did gate; anything else goes red. A
rejection with v1 unmoved is diagnosed as a non-lease failure and goes
red at once.
- release-tag loses its job-level concurrency group. The lease already
gives the ordering the group was there for, and the group was what
cancelled the one job that could have released the newest merge.
Without it each merge's job runs, and the one whose commit is still
the tip when it checks releases it.
The shell moves out of ci.yaml into scripts/release-v1.sh so shellcheck
and selftest.sh cover it. release-v1-selftest.sh runs it against a
scratch bare origin: sweep no-op at and ahead of the tip, tag on a
green gate, no tag and a failing sweep on a red one, the stranded trace
above followed by a catching-up sweep, and each lost-lease outcome, with
a control showing an unleased push does step v1 back. Red-proved by
seven mutations of release-v1.sh, each failing a named assertion: plain
--force, accepting any lost lease, a merge job that never defers,
ancestry reduced to equality, no non-lease diagnosis, a sweep that never
needs to run, and a retry that does not re-lease.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UkSjXXtU6JYcN2vPntWhfb
70 lines
2.3 KiB
YAML
70 lines
2.3 KiB
YAML
name: Release sweep
|
|
|
|
# Keeps v1 from lagging main when ci.yaml's release-tag job defers or never
|
|
# runs. Each tick either finds v1 already covering main's tip and exits, or
|
|
# gates the tip exactly as ci.yaml's selftest job does and moves v1 to it. A
|
|
# red run here means v1 is behind a main that fails its gate.
|
|
#
|
|
# Gitea registers schedules from the default branch only, so this fires once
|
|
# it is on main.
|
|
on:
|
|
schedule:
|
|
- cron: '*/15 * * * *'
|
|
|
|
# A tick that arrives while another is still gating waits behind it rather
|
|
# than gating the same tip twice.
|
|
concurrency:
|
|
group: release-sweep
|
|
cancel-in-progress: false
|
|
|
|
jobs:
|
|
sweep:
|
|
name: move v1 to main if it lags
|
|
runs-on: ubuntu-latest
|
|
timeout-minutes: 25
|
|
permissions:
|
|
contents: write
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
token: ${{ secrets.GITHUB_TOKEN }}
|
|
fetch-depth: 0
|
|
|
|
# A scheduled run's github.sha is main as of the last push, not
|
|
# necessarily its tip, so the tip is read here instead.
|
|
- name: Check whether v1 lags main
|
|
id: check
|
|
run: bash scripts/release-v1.sh sweep-check
|
|
|
|
# Everything below runs only when v1 lags, and gates the tip itself,
|
|
# not the commit this run was created from.
|
|
- name: Check out main's tip
|
|
if: steps.check.outputs.needed == 'true'
|
|
run: git checkout -q --detach "${{ steps.check.outputs.tip }}"
|
|
|
|
- name: Install shellcheck
|
|
if: steps.check.outputs.needed == 'true'
|
|
uses: taiki-e/install-action@v2
|
|
with:
|
|
tool: shellcheck
|
|
|
|
# Same toolchains, same order, as ci.yaml's selftest job.
|
|
- name: Install Rust nightly
|
|
if: steps.check.outputs.needed == 'true'
|
|
uses: dtolnay/rust-toolchain@nightly
|
|
- name: Install Rust toolchain
|
|
if: steps.check.outputs.needed == 'true'
|
|
uses: dtolnay/rust-toolchain@stable
|
|
|
|
- name: shellcheck
|
|
if: steps.check.outputs.needed == 'true'
|
|
run: shellcheck -x --source-path=scripts scripts/*.sh
|
|
|
|
- name: Selftests
|
|
if: steps.check.outputs.needed == 'true'
|
|
run: bash scripts/selftest.sh
|
|
|
|
- name: Move v1 to the gated tip
|
|
if: steps.check.outputs.needed == 'true'
|
|
run: bash scripts/release-v1.sh push "${{ steps.check.outputs.tip }}" "${{ steps.check.outputs.v1 }}"
|