ci(cutover): main's cutover.yml is edge's again, so the cutover PR merges (D397) #30

wtclaude · 2026-11-06T07:00:15-06:00

wtclaude commented

2026-11-06 07:00:15 -06:00

What & why

Unblocks the cutover PR #29. Every gate has passed on public 547616323393184824 (public, oxide and carbon in run 82; live and checks in run 84). The merge was refused because edge → main conflicts in .gitea/workflows/cutover.yml.

The cause is my mistake in #28: I changed edge's copy, but main's copy was added by its own commit (#26), so the two are an add/add conflict, not a fast path. This PR makes main's cutover.yml byte-for-byte edge's (git checkout origin/edge -- .gitea/workflows/cutover.yml).

It changes no commit on edge, so the gates kept for edge 761a9b67 stand. After this merges, the next hourly run (:11) only re-runs the PR checks and merges #29, and release.yml cuts the release.
As main's trigger, the new wiring is what edge's scripts expect: no staging static half, no --staging-work (the gate-1 change of #28, D397).

How it was tested

git merge-tree --write-tree origin/main origin/edge gives CONFLICT (add/add) today; on top of this commit it merges with no conflict (exit 0).
git diff HEAD origin/edge -- .gitea/workflows/cutover.yml is empty.
edge's cutover.test.js (which reads this file's step ids and outputs) passed on this exact content in #28's plugin-checks (run 81).

Checklist

I have read CONTRIBUTING.md.
The change builds and existing tests/checks pass locally.
I have added or updated tests/docs where it makes sense. (docs#414)
My commits are reasonably scoped with clear messages.

AI-assisted contributions (required)

No AI tools were used to produce this contribution.
AI tools were used. Tool(s): Claude Code (Claude Opus 5.5). I have reviewed and understand
every change, and take responsibility for it. AI-authored commits are
marked with a Co-Authored-By / Assisted-By trailer.

License

I agree that my contribution is licensed under this project's license
(GNU GPL v3.0 or later), and I have the right to contribute it.

🤖 Generated with Claude Code

https://claude.ai/code/session_014HJEmgsXtLR5kLfh7f9y8P

## What & why **Unblocks the cutover PR #29.** Every gate has passed on public `547616323393184824` (public, oxide and carbon in run 82; live and checks in run 84). The merge was refused because edge → main conflicts in `.gitea/workflows/cutover.yml`. The cause is my mistake in #28: I changed edge's copy, but main's copy was added by its own commit (#26), so the two are an add/add conflict, not a fast path. This PR makes main's `cutover.yml` byte-for-byte edge's (`git checkout origin/edge -- .gitea/workflows/cutover.yml`). - It changes **no commit on edge**, so the gates kept for edge `761a9b67` stand. After this merges, the next hourly run (:11) only re-runs the PR checks and merges #29, and `release.yml` cuts the release. - As main's trigger, the new wiring is what edge's scripts expect: no staging static half, no `--staging-work` (the gate-1 change of #28, D397). ## How it was tested - `git merge-tree --write-tree origin/main origin/edge` gives `CONFLICT (add/add)` today; on top of this commit it merges with no conflict (exit 0). - `git diff HEAD origin/edge -- .gitea/workflows/cutover.yml` is empty. - edge's `cutover.test.js` (which reads this file's step ids and outputs) passed on this exact content in #28's plugin-checks (run 81). ## Checklist - [x] I have read [CONTRIBUTING.md](CONTRIBUTING.md). - [x] The change builds and existing tests/checks pass locally. - [x] I have added or updated tests/docs where it makes sense. (docs#414) - [x] My commits are reasonably scoped with clear messages. ## AI-assisted contributions (required) - [ ] No AI tools were used to produce this contribution. - [x] AI tools were used. Tool(s): `Claude Code (Claude Opus 5.5)`. I have reviewed and understand every change, and take responsibility for it. AI-authored commits are marked with a `Co-Authored-By` / `Assisted-By` trailer. ## License - [x] I agree that my contribution is licensed under this project's license (**GNU GPL v3.0 or later**), and I have the right to contribute it. 🤖 Generated with [Claude Code](https://claude.com/claude-code) https://claude.ai/code/session_014HJEmgsXtLR5kLfh7f9y8P

wtclaude added 1 commit 2026-11-06 07:00:16 -06:00

ci(cutover): main's cutover.yml is edge's again, so the cutover PR merges (D397)

PR Checks / plugin-checks (pull_request) Successful in 21s

Details

8a9e8fa4b1

runicnpc-rust#28 changed edge's copy of cutover.yml (gate 1 reads Steam; the
staging static half is gone). main's copy was added by its own commit (#26), so
the two now conflict (add/add) and the cutover PR #29 cannot merge, though all
its gates passed. This makes main's copy byte-for-byte edge's. It changes no
commit on edge, so the gates kept for edge 761a9b67 stand and the next hourly
run only re-checks the PR and merges.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014HJEmgsXtLR5kLfh7f9y8P

whitlocktech merged commit 27ff34e689 into main

2026-11-06 07:26:07 -06:00

whitlocktech deleted branch ci/cutover-yml-match-edge

2026-11-06 07:26:08 -06:00

whitlocktech referenced this issue from a commit

2026-11-06 07:26:10 -06:00

Merge pull request 'ci(cutover): main's cutover.yml is edge's again, so the cutover PR merges (D397)' (#30) from ci/cutover-yml-match-edge into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: RunicGateway/runicnpc-rust#30