grain.social/grain

Switch repository

Loading…

What changes

This merges main at 0eb252c ("ci: the workflows use knotless's shared steps") into feature/rust. It conflicted in three workflow files; each keeps both sides.

• check.yml, test.yml: main's chadtmiller.com/steps/npm-ci@1 replaces the pasted packages step. feature/rust's queue: first pre-flight, its pull trigger on refs/heads/feature/*, and its cutover notes stay.
• publish-lexicons.yml: main's publish-lexicons@1 (plan, and publish at main) and wait-for-checks@2 replace the script and the hand-written checks loop. The wait names all five workflows that feature/rust's loop waited on: check test rust harness lexicons, not main's test check. The step's default wait, 25 minutes, is the same as the old loop's. deploy/publish-lexicons.mjs goes, as on main.

.knotless/uses.lock comes in from main unchanged.

Why

The standing pull from feature/rust into main (grain runs on a Rust server modelled on knotless, without hatk) stopped checking: every workflow failed with "conflicts with main at 0eb252c". Its job is to say whether the whole branch still passes against main. AGENTS.md says to merge main into the feature branch as main moves.

How it was checked

Left to CI: this pull's check and test run the npm-ci step. publish-lexicons runs only at main or when asked, so its steps aren't exercised here; they're the same steps main already runs.

🤖 Generated with Claude Code

This merges main's shared-steps change into feature/rust. I found nothing that has to change.

• check.yml and test.yml swap the pasted packages step for npm-ci@1. The queue: first pre-flight, the feature/* pull trigger and the cutover notes stay.
• publish-lexicons.yml matches main's file. The one difference is the wait list, which is check test rust harness lexicons, the five workflows feature/rust waited on. I read that as intended.
• uses.lock matches what the workflows reference: npm-ci@1, publish-lexicons@1 and wait-for-checks@2.
• No references to the deleted deploy/publish-lexicons.mjs remain on the branch. I searched for the name and found none.

When I looked, the check, test, rust and harness runs were still queued or running, and only lexicons had finished, skipped as expected. I'd wait for them to pass before merging, since they are the only exercise of npm-ci here.