Skip to content

ci(release): fallback to direct merge when auto-merge is disabled#45

Merged
JSONbored merged 2 commits intomainfrom
codex/release-full-no-auto-merge
Apr 15, 2026
Merged

ci(release): fallback to direct merge when auto-merge is disabled#45
JSONbored merged 2 commits intomainfrom
codex/release-full-no-auto-merge

Conversation

@JSONbored
Copy link
Copy Markdown
Owner

Summary

Fixes action=full release orchestration so it no longer fails when repository-level GitHub auto-merge is disabled.

What changed

  • Updated Release / Sure-AIO full-release merge step to:
    • try gh pr merge --auto first
    • detect enablePullRequestAutoMerge limitation
    • automatically fall back to direct merge polling/retry
  • Preserved one-dispatch release flow: prepare PR -> merge -> tag/release -> dispatch image publish workflow.
  • Updated release documentation to reflect fallback behavior.

Why

action=full previously failed in repos where GitHub auto-merge is not enabled, causing release orchestration to stop mid-flow and creating operational churn.

Validation

  • Parsed workflow YAML successfully (release.yml ok)
  • Verified fallback logic paths and docs updates
  • Confirmed branch pushed and ready for PR

Notes

  • After merge, action=full should work in both environments:
    • auto-merge enabled
    • auto-merge disabled (fallback path)

@JSONbored JSONbored merged commit 7f3bf35 into main Apr 15, 2026
9 checks passed
@JSONbored JSONbored deleted the codex/release-full-no-auto-merge branch April 15, 2026 22:34
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