From a7824cf234d7109c0241e848e78d7f21bd098997 Mon Sep 17 00:00:00 2001 From: Omar Ramadan Date: Mon, 10 Aug 2026 03:02:59 +0000 Subject: [PATCH] fix(ci): support merge queue lockfile refresh Co-Authored-By: Paperclip --- .github/workflows/refresh-lockfile.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/refresh-lockfile.yml b/.github/workflows/refresh-lockfile.yml index 9e86ff1e59a0..125186ef496a 100644 --- a/.github/workflows/refresh-lockfile.yml +++ b/.github/workflows/refresh-lockfile.yml @@ -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 }}"