Skip to content

fix(ci): pull latest main before creating release branch - #269

Merged
baleen37 merged 3 commits into
mainfrom
fix/release-workflow-pull
Jan 31, 2026
Merged

fix(ci): pull latest main before creating release branch#269
baleen37 merged 3 commits into
mainfrom
fix/release-workflow-pull

Conversation

@baleen37

@baleen37 baleen37 commented Jan 31, 2026

Copy link
Copy Markdown
Owner

Root Cause

Release PRs were failing CI because the release branch was created from stale main state. The workflow would:

  1. Run semantic-release (modifies only version files)
  2. Create release branch from current state
  3. Commit and push

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-only before 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

  • Chores
    • Enhanced the release workflow to synchronize with the latest main branch changes before publishing new versions.

✏️ Tip: You can customize this high-level summary in your review settings.

baleen37 and others added 3 commits January 31, 2026 18:34
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>
@coderabbitai

coderabbitai Bot commented Jan 31, 2026

Copy link
Copy Markdown

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

The release workflow now includes a git pull origin main --ff-only step before committing version changes. This ensures the release branch is synchronized with the latest main branch commits prior to the version bump being committed.

Changes

Cohort / File(s) Summary
Release Workflow
.github/workflows/release.yml
Added git pull origin main --ff-only step before version bump commit to synchronize release branch with latest main branch changes.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~5 minutes

Possibly related PRs

Suggested labels

released

Poem

🐰 A pull from main, oh what a sight!
The release branch now stays in sync, so tight!
Fast-forward only, no conflicts to fear,
Version bumps land safe, crystal clear!

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/release-workflow-pull

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 and usage tips.

@baleen37
baleen37 merged commit 80b124b into main Jan 31, 2026
1 of 2 checks passed
@baleen37
baleen37 deleted the fix/release-workflow-pull branch January 31, 2026 09:39
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