ci: untie fork releases from the upstream mirror and harden fork-sync - #41
Merged
Merged
Conversation
Releases no longer depend on the upstream mirror: fork-release.yml no longer requires fork/main to contain origin/main and derives the release label base from the fork's own apps/kimi-code/package.json, so fork/main can be released on its own schedule without syncing upstream first. fork-sync hardening: - sync-main self-heals the pristine mirror with a force-with-lease push instead of failing closed on divergence (the pristine-main ruleset has the documented repository-admin bypass). - The merge-conflict tracking loop no longer masks conflicts: it comments on the existing tracking issue (listing the conflicting files) instead of silently skipping, and a conflict-free sync closes the issue. - fork/README.md corrected to match the live rulesets and the new versioning rule (a future sync's conflict resolution must bump the fork pkg base).
5 tasks
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
1 participant
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.
Related Issue
No issue — fork infrastructure fix (release pipeline independence).
Problem
The MB release pipeline could not cut a release unless
fork/maincontained the upstream mirror (origin/main). A mirror that is a few commits ahead (same version) blocks the release entirely, and the release label base was read from the mirror'spackage.json, coupling the fork's release schedule to upstream's. The fork-sync conflict-tracking loop also masked conflicts: a stale-open tracking issue suppressed notifications for later, different conflicts.What changed
fork-release.yml— releases independent of upstream:fork/main's own state on its own schedule.<base>-MB.<x>.<y>) is derived from the fork's ownapps/kimi-code/package.json(the label the fork is shipping) instead of the upstream mirror — label and payload come from the same file, so a mismatched base stamp is structurally impossible.fork-sync.yml— robust, self-healing, non-blocking:sync-mainfalls back to a--force-with-leasereset if the pristine mirror ever diverges, instead of failing closed with a manual-admin demand (thepristine-mainruleset carries the documented repository-admin bypass;fork/mainis never force-pushed — no bypass exists there).fork/README.md: corrected to match the live rulesets (admin bypass onpristine-main, direct mirror push) and the new versioning rule (a future sync's conflict resolution must bump the fork pkg base, or the next release would label synced code with the stale base).Checklist
gen-changesetsskill, or this PR needs no changeset. — No changeset: release-pipeline tooling only, not user-perceivable CLI behavior (per the skill's Core Rule 6).gen-docsskill, or this PR needs no doc update. —fork/README.mdupdated in this PR.