Skip to content

fix(ci): support merge queue lockfile refresh #1239

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
kkroo merged 1 commit into from
Aug 10, 2026
Merged

fix(ci): support merge queue lockfile refresh #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions .github/workflows/refresh-lockfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
run: |
# Lockfile PRs are bot-generated, policy-exempt, and carry no required
# checks, so merge immediately. `gh pr merge --auto` needs repo-level
# auto-merge, which is disabled here and 404s, leaving every refresh
# PR stranded for a manual merge. Merge directly; fall back to --auto
# only if a branch-protection rule is ever added that blocks it.
gh pr merge --squash --delete-branch "${{ steps.upsert-pr.outputs.pr_url }}" \
|| gh pr merge --auto --squash --delete-branch "${{ steps.upsert-pr.outputs.pr_url }}"
# The merge queue owns the eventual merge and rejects --delete-branch
# because it is asynchronous. Keep the refresh branch: the next run
# deliberately force-updates it before reusing its PR.
gh pr merge --squash "${{ steps.upsert-pr.outputs.pr_url }}" \
|| gh pr merge --auto --squash "${{ steps.upsert-pr.outputs.pr_url }}"
Loading