Skip to content

fix(release): auto-merge release hotfixes into main instead of blocking #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CanyoufeeltheAGI merged 2 commits into from
Mar 7, 2026
Merged

fix(release): auto-merge release hotfixes into main instead of blocking #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb13552
Initial plan
Copilot Mar 7, 2026
b4c20cb
fix: update release workflow to auto-merge release hotfixes back into…
Copilot Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
echo "New version: $NEW_VERSION"
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT

- name: Verify release is not ahead of main
- name: Merge any release-only commits back into main
run: |
git fetch origin release:release || true

Expand All @@ -78,9 +78,15 @@ jobs:
# Check if release has commits not in main
AHEAD=$(git rev-list --count main..release)
if [ "$AHEAD" -gt 0 ]; then
echo "❌ Error: release branch is $AHEAD commit(s) ahead of main"
echo "This should never happen. Please investigate."
exit 1
echo "⚠️ release branch is $AHEAD commit(s) ahead of main (hotfixes pushed directly to release)"
echo "Merging release commits back into main to preserve them..."
if ! git merge release --no-edit -m "chore: merge release hotfixes back into main"; then
echo "❌ Merge failed due to conflicts. Resolve conflicts manually, then re-run this workflow."
git merge --abort
exit 1
fi
git push origin main
echo "✅ Successfully merged $AHEAD release commit(s) into main"
fi
fi

Expand Down