chore(release): set main to 1.9.5 - #378
Merged
Merged
Conversation
The stable tag is published and every byte of it is already on main — the release branch was built entirely from cherry-picks, so the only thing main still lacks is the version number itself. Doing this instead of merging the sync PR the promote workflow opened. That PR replays 26 commits, 23 of which are the cherry-picks main already has under different SHAs, and one of those (db101b9) touches NewEditorShell.tsx — the same file 210e5da changed after the release branch forked. Rebasing a stale version of that file over a newer one is how a merge silently drops the newer change, and the workflow's own rebase already failed five times against it. `feat(editor): delete a project from the Open project dialog` is deliberately held for 1.10 and must survive this sync. Verified before writing: `git diff main v1.9.5` is empty across every path except package.json, package-lock.json, and the files that feature adds.
Bumping the version rewrites package-lock.json, which changes the hash Nix records for the npm dependency set — so nix-check failed on the previous commit here. The value is the one CI computed. This is the same edit `bump-nix-package.yml` makes after a stable release; it derives the hash from the lockfile at the tag, and that lockfile is now byte-identical to this branch's, so both compute sha256-fBNFOicysW5FAbPERqzXUzIcQ0C+ICsQFtGt1agF1VI=. Doing it here keeps main coherent in one commit instead of leaving it briefly stale. Worth noting the tag itself ships the old hash: the release-branch bumps are [skip ci], so nothing checks it there, and the post-release workflow is what fixes it. That is the designed flow, not a defect — but it does mean `nix build` at a stable tag fails until that PR lands.
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughThe package version changes from ChangesPackage release metadata update
Estimated code review effort: 1 (Trivial) | ~2 minutes Merge Risk: ⚪ Minimal · up to This PR makes a small, localized release-version update; no actionable merge-blocking risk remains after normal checks and review. Possibly related PRs
Suggested reviewers: 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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
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.
Replaces the sync PR the promote workflow opened (#377), which should be closed rather than merged.
Why not merge #377
v1.9.5was built entirely from cherry-picks offmain, so main already has every byte of the release. Proven rather than assumed —git diff main v1.9.5is empty across every path exceptpackage.json,package-lock.json, and the files belonging to210e5da2, which main has extra:A rebase-merge of #377 would nonetheless replay 26 commits, 23 of them cherry-picks main already carries under different SHAs. One of those,
db101b91(import a recording once), touchessrc/components/ai-edition/NewEditorShell.tsx— the same file210e5da2changed after the release branch forked. Replaying a pre-210e5da2version of that file on top of a post-210e5da2main is how a sync silently drops the newer change, and the promote workflow's own rebase already failed five times against exactly this.feat(editor): delete a project from the Open project dialogis deliberately held back for 1.10 and has to survive.GitHub reports #377 as
MERGEABLE, but that flag describes a three-way merge; this repo rebase-merges, which is the operation that failed.What this does instead
Sets
package.jsonandpackage-lock.jsonto1.9.5via the repo's ownset-release-version.mjs— the one thing main actually lacks. Two files, three lines.Release is out:
v1.9.5tagged atafbfb7bb, build green, artifacts published.Summary by CodeRabbit
No new user-facing features or behavioral changes are included in this release.