Repository navigation
ci: main stops carrying ci-<lang>.yml; document the CI layout - #90
Merged
Merged
Conversation
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
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.
Step 3c of making Sync Downstream Branches robust. Steps a and b (#85 and #86 to #89) moved the shared steps into composite actions and made each branch's
ci-<lang>.ymla thin file of its own; this finishes it.Changes
ci-kotlin.yml,ci-rust.yml,ci-ts.ymlandci-swift.ymlfrommain. Their triggers only fire for their own branch, so they never ran onmain; the copy there was only a template that both sides then edited. Each language branch keeps and owns its own.docs/ci.md(new, linked fromdocs/README.md): who owns which CI file, the two composite actions, a templateci-<lang>.ymlfor a new language branch, and how the downstream sync works and what to do when it conflicts.AGENTS.md: new rule 1.5, shared CI (release.yml,.github/actions/*) is edited onmainonly.What the sync will do
A dry run of the post-merge
mainagainst each branch shows one modify/delete conflict per branch, on its ownci-<lang>.yml(deleted here, modified there), nothing else (swift'sdocs/README.mdauto-merges). So the automatic sync fails once after this merges; I will resolve each branch by keeping its file, withgit merge main, and re-run it. After thatmainhas no file a branch edits, which is what kept conflicting.Not in this PR: a guard that rejects a language-branch PR touching a shared file (idea 5); it would have to be called from each branch's own workflow.
🤖 Generated with Claude Code