chore: retire dev as a standing integration branch (ADR-0022) - #1241
Merged
Merged
Conversation
- ci.yml: drop dev from the push trigger — CI runs on main + PRs only - docs/adr: 0022 supersedes 0021's branch model; 0021 amended with a status note pointing to it Companion to: flipping the GitHub default branch dev -> main (done), retargeting #1235/#1226/#577 from dev to main (done), and #1240 (porting the #1218 guard, missing on main, from dev). origin/dev deletion follows once #1240 lands.
|
Warning Review limit reachedNext included review available in 57 minutes. View limit detailsLimit details: You’ve used the included review currently available. You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Review configuration: ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Advanced Run ID: 📒 Files selected for processing (3)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
What
Supersedes ADR-0021's branch model with ADR-0022. Mechanical parts of
the reconciliation already done directly (not code, so no diff here):
dev->maindev(ci: engine typecheck gate + fix dev's engine type errors (#1228) #1235, feat(session): Pause/Resume engine primitive — Paused durable marker + foreground sentinel (#1221) #1226, chore(deps-dev): bump the dev-dependencies group across 1 directory with 6 updates #577) tomainThis PR's diff:
ci.yml: dropdevfrom the push triggerdocs/adr/0021-...md: amended with a superseded-status notedocs/adr/0022-retire-dev-branch.md: the new record — full rationale,evidence, and what's kept vs retired
Why (short version — see ADR-0022 for the full case)
devregressed a shipped fix within 48 hours of ADR-0021 landing (wave-2'sback-merge silently dropped the fix(app-bundle): drop messages with empty content array before API dispatch #1218 guard; CI stayed green because no CI
job runs the overlay's own test suite). See fix(engine): port the #1218 empty-content guard onto main (currently only on dev) #1240 for the port back onto
main.devwas also the GitHub default branch — not just a git ref — which iswhy PRs opened without an explicit
--base(including the fix for theregression above) and Dependabot silently targeted it instead of
main,contradicting
CONTRIBUTING.md.from ADR-0021 was this same
ci.ymltrigger line.branch — wave-2's actual peak divergence was 18 commits over ~1.5 days,
which an ephemeral
integration/wave-Nbranch (created per batch, deletedon merge) gets identically.
What's NOT rejected
The canary concept itself — continuous testing of a real in-place upgrade on
persistent fleet state, which CI's disposable runners structurally can't do —
is retargeted at
main's own CI-green commits/tags, not deleted. ADR-0022has the build-out sketch.
Sequencing
mainorigin/devonce fix(engine): port the #1218 empty-content guard onto main (currently only on dev) #1240 lands (its tip SHA will be recorded herefirst, so it's trivially recoverable if anyone needs it)
For Aaron/JJ
This reverses ADR-0021 two days after it landed — flagging explicitly
rather than landing it as a fait accompli. Happy to talk through the
evidence in the ADR if any of it reads differently from where you were
sitting when you wrote it.