gh pr update-branch + manual merge. This PR makes the cron set --auto on the PR it creates, so the rebase + merge happen automatically.chore/cc-snapshot-<run_id>.strict: true → PR cannot merge until rebased.This is exactly what happened to PR #1600 today — until I ran gh pr update-branch 1600 --rebase by hand.
- name: Open snapshot PR
id: cpr # ← capture output
if: success() && steps.changes.outputs.has_changes == 'true'
uses: peter-evans/create-pull-request@...
with:
...
- name: Enable auto-merge on snapshot PR # ← NEW
if: success() && steps.cpr.outputs.pull-request-number
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh pr merge "${{ steps.cpr.outputs.pull-request-number }}" \
--repo "${{ github.repository }}" \
--auto \
--squash \
--delete-branch
gh pr merge --auto queues the merge for when required checks pass and triggers an automatic rebase when the PR is BEHIND. No human action needed.
strict: true still applies — the PR must be up-to-date AND all required checks must pass before it merges. Auto-merge doesn't bypass any of that; it just removes the manual step.required_approving_review_count: 0 so no human review is needed (CI is the gate).cc-support-window-bump.yml's bump PRs (per peter-evans's integration with the repo's auto-merge setting).