[WRONG BRANCH] chore(release): promote main v2.42.0 onto preview and open 2.43.0-preview - #3435
Conversation
release: promote dev into main for v2.32.1
# Conflicts: # package.json
[WRONG BRANCH] merge dev into main for the v2.33.0 release
Promotes the dev integration line onto main. The resulting tree is byte-identical to origin/dev, including package.json at 2.34.0. The package.json conflict is resolved to dev's side, NOT to main's stale 2.33.0. Earlier promotions (#2553, #2507) kept the target's version so the release bump would land on its own "release: vX.Y.Z" commit. That is no longer legal: this very delta adds tests/release-version-line.test.ts, which fails when the in-tree version sits behind the highest release tag. With v2.34.0-preview.20260827 now published, 2.33.0 orders behind it, so a promotion carrying the stale line turns CI red on every shard that runs the suite. The consequence for the release step is that scripts/release.ts skips the bump (release.ts:568, currentVersion === version), so v2.34.0 gets tagged on this merge commit rather than on a separate release commit. The workflow creates the tag itself after publishing and validates expected-sha against the checked-out commit, so the tag still names exactly the audited tree.
[WRONG BRANCH] promote dev onto main for v2.34.0
[WRONG BRANCH] promote dev onto main for v2.35.0
[WRONG BRANCH] promote dev onto main for v2.36.0
[WRONG BRANCH] promote dev to main for the v2.37.0 release
[WRONG BRANCH] promote dev onto main for v2.38.0
[WRONG BRANCH] promote dev onto main for v2.39.0
release: promote dev to main for v2.40.0
…rkflow call (#3262) Both v2.40.0 release dispatches (33615174183 preview, 33615177849 main) died at startup_failure: a workflow_call cannot grant its callee more than the calling job holds, and dev-version-bump.yml's job declares contents+pull- requests write. #3129 wired the call but never dispatched a release, so this is its first live run. The caller job now declares exactly the callee's two permissions; no other job in release.yml gains anything. Co-authored-by: jun <jun@lidge.dev> (cherry picked from commit 7ce0ba5)
release: carry the release.yml permissions fix onto main for v2.40.0
[WRONG BRANCH] release: v2.41.0
[WRONG BRANCH] release: promote dev onto main for the main-account badge fix
…view preview had diverged from main: it carried 28 merge commits main did not have, while main carried 23 preview did not, so preview could not fast-forward. The divergence was history only - the sole CONTENT difference between the two branches was the package.json version line. This merge takes main (48f8186, the v2.42.0 release commit) into preview and resolves the tree to main's content, so preview now matches the released tree exactly apart from its own prerelease version line. The version could not stay at 2.42.0-preview.20260903: v2.42.0 has published, and compareReleaseTags ranks that prerelease BEHIND its own stable release (-1), which is what tests/release-version-line.test.ts fails on. preview opens the next prerelease line at 2.43.0-preview.20260904, matching dev's 2.43.0.
github-actions
Bot
added
the
chore
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
✅ Deterministic PR hygiene checks passed. |
github-actions
Bot
changed the title
⏳ DRAFT
What to do
Its title has been prefixed with |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Team Run ID: 📒 Files selected for processing (1)
Included review availability: Your plan provides up to 10 included reviews per hour; 8 remain after this review. 📝 WalkthroughWalkthroughThe pull request updates the package preview version in ChangesPackage version update
Estimated code review effort: 1 (Trivial) | ~2 minutes Merge Risk: ⚪ Minimal · up to This updates the preview package version to the next prerelease line. No current merge-blocking risk is identified. 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches 💡 1🛠️ Fix failing CI checks 💡
🧪 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 |
리뷰 · 우선순위 56 / 80이 PR은 본문 설명대로 버전을 그냥 체크 상태도 본문 노트와 맞다. 현재
메인테이너의 판단이 필요한 지점
너의 추천 이 댓글은 grok-bot이 작성했습니다 |
github-actions
Bot
added
bug
1 participant
Summary
Realign
previewwithmainafter the v2.42.0 release and open the next prerelease line.previewhad diverged frommain: 28 commits onpreviewwere absent frommain, and 23 commits onmainwere absent frompreview, sopreviewcould not fast-forward (git push --dry-runrejects it as non-fast-forward, and theProtect previewruleset blocks non-fast-forward updates). The divergence was history only — the sole content difference between the two branches was thepackage.jsonversion line:This merges
main(48f818664, the v2.42.0 release commit) intopreviewand resolves the tree tomain's content, sopreviewnow matches the released tree exactly apart from its own prerelease version line.Why the version moves.
previewcould not keep2.42.0-preview.20260903: v2.42.0 has published, and the repository's own comparator ranks that prerelease behind its own stable release, which is exactly whattests/release-version-line.test.tsfails on.So
previewopens the next prerelease line at2.43.0-preview.20260904, consistent withdevmoving to2.43.0in #3434.Verification
git merge-base --is-ancestor origin/preview <head>— exit 0, so this is a fast-forward forpreviewand satisfies the non-fast-forward rule.git merge-base --is-ancestor 48f818664 <head>— exit 0, confirming the v2.42.0 release commit is carried.git diff --stat 48f818664 <head>—package.json | 2 +-. The tree is otherwise byte-identical to the releasedmain.git merge-tree --write-tree origin/preview origin/main— clean, no conflicts.compareReleaseTagsfromscripts/release-notes.ts(quoted above).Checklist
main.)Note on
enforce-targetenforce-targetfails promotion PRs targetingpreviewby design, as recorded on the earlier promotion #3409. This PR supersedes #3409, which targeted the now-stalev2.42.0line.Summary by CodeRabbit
2.43.0-preview.20260904.