Repository navigation
chore(release): release v2.1.0 into main - #1313
Conversation
Set main to 2.1.0 to match the release branch. promote.yml could not rebase-merge the sync PR (#1312): main already holds every cherry-pick, so only the version bump commits were missing, and they no longer replay cleanly on main. Takes package.json, package-lock.json and nix/package.nix from release/v2.1.0-sync; the lockfiles differ only by the version, so the npm deps hash carries over unchanged.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Merge Risk: ⚪ Minimal · up to
|
promote.yml rebase-merged the whole release branch into main. Every fix on it is a cherry-pick already on main, so the replay stopped applying once main had moved on: v2.1.0's sync PR (#1312) failed five times and main stayed at 2.0.0 until #1313 set the version by hand. The step now branches from main, sets the stable version with set-release-version.mjs and refreshes the Nix npm hash against main's lockfile. A commit found on the release branch alone (git cherry, version bumps aside) is named and fails the step after the version sync, so a fix made there by mistake is not silently dropped.
Summary
Sets main to 2.1.0, the version just released.
promote.ymlcould not rebase-merge the sync PR #1312, so main was left at 2.0.0.release/v2.1.0:git cherrylists only the seven version bump commits as missing.package.json,package-lock.jsonandnix/package.nixfromrelease/v2.1.0-sync. The lockfiles differ only by their version field, so the npm deps hash carries over unchanged.Supersedes #1312.
Type of change
Testing
git diff origin/release/v2.1.0-sync HEAD -- package.json package-lock.json nix/package.nixis empty.🤖 Generated with Claude Code
Summary by CodeRabbit