fix: restore version fields to 1.28.0 on develop - #1286
Conversation
The main->develop ancestry-reconciliation merge (-s ours, PR #1253) advanced the merge-base but used a zero-file-change merge, so develop's version fields were never updated to match main's actual v1.28.0 release. This left package.json, packages/suite/package.json, and sonar-project.properties at the stale 1.27.1 value, causing any branch cut from develop (e.g. hotfix/v1.28.1) to incorrectly regress main's version when merged. This brings develop's version fields in line with main (v1.28.0) so future release/hotfix branches inherit the correct base version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
WalkthroughThe release version changed from ChangesRelease version alignment
Estimated code review effort: 1 (Trivial) | ~2 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 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 |
|
|
Superseded by a new PR from bugfix/develop-version-1.28.0 — branch naming rule requires 'feature/', 'bugfix/', or 'dependabot/' prefix when targeting develop. Closing this one in favor of the renamed branch. |
Pull request was closed
## Summary Restore develop's stale version fields to `1.28.0` in: - `package.json` - `packages/suite/package.json` - `sonar-project.properties` ## Root cause The main -> develop ancestry-reconciliation merge done with `-s ours` in PR #1253 advanced the merge-base without bringing over the version-file changes from main. As a result, develop's release version fields stayed at `1.27.1` even though main had already released `v1.28.0`. That stale state then caused hotfix/v1.28.1 (branched from develop) to regress main's version metadata in PR #1285. ## Why this PR This PR brings develop's version fields back in line with main (`v1.28.0`) so future release and hotfix branches inherit the correct base version. ## References - PR #1253 - PR #1285 - Supersedes and replaces closed PR #1286 (renamed branch to satisfy develop branch naming rules)



Summary
-s oursWhy this is needed
PR #1253 advanced the ancestry between main and develop with a zero-file-change merge, so develop never actually received main's v1.28.0 version bump. As a result, develop (and branches cut from it, such as PR #1285's
hotfix/v1.28.1branch) inherited 1.27.1 in:package.jsonpackages/suite/package.jsonsonar-project.propertiesThat stale state can cause release automation to compute the wrong next version and makes merges from hotfix branches appear to regress main's version. Restoring 1.28.0 on develop keeps it aligned with main's actual released version (tag
v1.28.0) and prevents future release/hotfix branches from inheriting the wrong base version.Context
-s oursSummary by CodeRabbit