Skip to content

chore(release): release v2.1.0 into main - #1313

Merged
EtienneLescot merged 1 commit into
mainfrom
chore/release-v2.1.0-into-main
Oct 17, 2026
Merged

EtienneLescot merged 1 commit into
mainfrom
chore/release-v2.1.0-into-main

Conversation

@EtienneLescot

@EtienneLescot EtienneLescot commented Oct 17, 2026 •

Copy link
Copy Markdown
Member

Summary

Sets main to 2.1.0, the version just released. promote.yml could not rebase-merge the sync PR #1312, so main was left at 2.0.0.

  • Main already holds every fix cherry-picked onto release/v2.1.0: git cherry lists only the seven version bump commits as missing.
  • Those bumps no longer replay on main, which is why chore(release): release v2.1.0 into main #1312 is unmergeable.
  • This PR takes package.json, package-lock.json and nix/package.nix from release/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

  • Chore (release)

Testing

  • git diff origin/release/v2.1.0-sync HEAD -- package.json package-lock.json nix/package.nix is empty.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Updated the package version to 2.1.0.

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.
@coderabbitai

coderabbitai Bot commented Oct 17, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 8ece9be6-0202-42c9-b81a-e851dfe4fdae
📥 Commits

Reviewing files that changed from the base of the PR and between 2505ab7 and c8dca88.

⛔ Files ignored due to path filters: 1
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing: 2
  • nix/package.nix
  • package.json

Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 3 remain after this review.

📝 Walkthrough

The package version changed from 2.0.0 to 2.1.0. The Nix package definition now uses a different npmDepsHash.

Changes: Package Release Update

Layer / File(s) Summary
Package version and dependency hash
package.json, nix/package.nix
The package version changed from 2.0.0 to 2.1.0. The Nix package definition uses a new npmDepsHash.

Priority: ⬇️ Low

Estimated code review effort: 1 (Trivial) | ~5 minutes

Change: Other

Suggested reviewers: christian-wr

Merge Risk: ⚪ Minimal · up to c8dca

This is a version bump to 2.1.0 with a matching Nix dependency hash update. No actionable merge risk was found, and the Nix CI check will confirm the hash.

Pre-merge checks: Passed 5
Check name Status Explanation
Title check Passed The title clearly and concisely identifies the release of version 2.1.0 into main.
Description check Passed The description explains the release synchronization issue, the source branch, the affected files, and the testing performed. It is sufficiently complete and directly related to the pull request, alth…
Docstring Coverage Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description explains the release synchronization issue, the source branch, the affected files, and the testing performed. It is sufficiently complete and directly related to the pull request, although it omits some optional template sections such as release impact and desktop impact.

Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files. (2 skipped: 2 unsupported.)

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@EtienneLescot
EtienneLescot merged commit e4039ae into main Oct 17, 2026
22 checks passed
@EtienneLescot
EtienneLescot deleted the chore/release-v2.1.0-into-main branch October 17, 2026 10:30
EtienneLescot added a commit that referenced this pull request Oct 18, 2026
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant