Generate the Clint update manifest only on the publish branch - #700
Merged
Merged
Conversation
clint/updates/index.json is derived data: every field comes from the update folders (seq is a plain (date, id) sort, and appliedState never stores it). Tracking it on development branches meant any two update PRs open at once both appended an entry at the same position and always conflicted, with a purely mechanical resolution. Untrack and gitignore it. clint-publish-updates now runs the generator and commits the manifest onto the clint-updates branch, which is the only ref that carries one and the ref consumers already fetch, so the runtime contract and indexGitUrl are unchanged. clint-update-index drops the "committed manifest is current" check and instead fails if index.json has been re-committed. Its workflow and check-run names are kept so required-status-check rules keep matching. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
sa-mussen
approved these changes
Sep 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.




Why
clint/updates/index.jsonconflicted on essentially every branch that shipped a frontend update. Two update PRs open at once both append an entry at the same position, so the merge always failed — and the resolution was always mechanical (re-run the generator).The file is derived data. Every field comes from the update folders:
title/date/issues/pr/requiresfrom eachupdate.json,hasOpsfrom whether it has afrontend/rootblock,legacyVersionfrom the semver folder name, andseqfrom a plain(date, id)sort.AppliedStatealready documents thatseqis never stored in a project, precisely so it can be regenerated freely.We also already have a derived publish branch:
clint-publish-updatesforce-pushes develop toclint-updates, and consumers'indexGitUrlpoints atclint-updates— not at develop. So the manifest only ever needs to exist there, andclint-updatesis never merged into anything.The existing workflow header even anticipated this trade-off.
What changed
clint/updates/index.json. No development branch carries it, so the conflict becomes structurally impossible rather than just easier to resolve.clint-publish-updatesis now the sole producer — it builds the CLI, runsupdate:index, commits the manifest on top of develop's tree, and force-pushes toclint-updates.clint-update-indexdropped the "committed manifest is current" check and gained the inverse guard: it fails ifindex.jsonis re-committed by mistake. Workflow name and theValidate update manifestcheck-run name are unchanged so required-status-check rules keep matching.authorflow.ts,updateNew.ts,updateIndex.tsheader, both Clint docs pages, and theauthoring-clint-updatesskill.No consumer change.
indexGitUrl,updateRef,updatePathand the runtime fetch path are all untouched — the file lands onclint-updatesat exactly the same path.Verification
yarn build-clisucceeds;tscreports no new errors (the pre-existingora/openinterop errors are unrelated).update:indexruns clean and its output is correctly gitignored.clint-updatesends up as develop's commit plus one manifest commit, and a consumer clone of that branch finds the file where it expects it.Note for reviewers with open branches
Merging this develop into a branch that still tracks the file produces a one-time
CONFLICT (modify/delete). Resolve with:Once per open branch, then never again.
Also worth knowing: the committed manifest had already drifted from what the generator produces (two entries both at
seq: 9) — the exact hazard this removes. It self-corrects on the first publish.🤖 Generated with Claude Code