fix(ci): pull latest main before creating release branch - #269
Merged
Conversation
This empty commit triggers a new release to properly include the auto-updater fix from the previous release. Co-Authored-By: Claude <noreply@anthropic.com>
The release workflow was creating release branches that didn't include the latest commits from main, causing Release PRs to fail CI with outdated code. Added `git pull origin main --ff-only` before committing release changes to ensure the release branch includes all recent commits. Root cause: semantic-release only modifies version files, but the release branch needs to include ALL recent commits from main for CI to pass properly. Co-Authored-By: Claude <noreply@anthropic.com>
|
Caution Review failedThe pull request is closed. 📝 WalkthroughWalkthroughThe release workflow now includes a Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~5 minutes Possibly related PRs
Suggested labels
Poem
✨ 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 |
4 tasks
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
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.
Root Cause
Release PRs were failing CI because the release branch was created from stale main state. The workflow would:
But if other commits were pushed to main between checkout and release branch creation, those commits would not be included in the release branch.
Fix
Added
git pull origin main --ff-onlybefore committing release changes to ensure the release branch includes ALL recent commits from main.This ensures Release PRs are created from the latest main state and include all fixes.
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.