Skip to content

fix(ci): squash-merge sync prs when auto-merge is unavailable - #248

Merged
gurezo merged 1 commit into
mainfrom
fix/ci-automerge-clean-status
Aug 23, 2026
Merged

gurezo merged 1 commit into
mainfrom
fix/ci-automerge-clean-status

Conversation

@gurezo

@gurezo gurezo commented Aug 23, 2026

Copy link
Copy Markdown
Owner

Summary

  • sync-example-upstreams / sync-devices で、必須チェックがなく PR がすでに CLEAN のときに GitHub が auto-merge を拒否して workflow が失敗する問題を修正しました
  • auto-merge を有効化できない場合は、8/16 の成功時と同じく squash merge にフォールバックします
  • 同じ原因で止まっていた chore(sync-example-upstreams): update platform example sync artifacts #247 は squash merge 済みです

Test plan

  • workflow YAML の Enable auto-merge ステップが gh pr merge --squash --auto → 失敗時 squash merge になっていること
  • 次回の sync-example-upstreams / sync-devices 実行で、PR 作成後に workflow が失敗せず merge まで進むこと
  • auto-merge 以外の失敗(権限不足など)では、従来どおり workflow が失敗すること

Made with Cursor

GitHub rejects enablePullRequestAutoMerge when a PR is already CLEAN.
Fall back to an immediate squash merge so weekly sync PRs are not left open.

Co-authored-by: Cursor <cursoragent@cursor.com>
@gurezo
gurezo merged commit c7e8821 into main Aug 23, 2026
5 checks passed
@gurezo
gurezo deleted the fix/ci-automerge-clean-status branch August 23, 2026 01:12
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