Skip to content

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

Merged
kkroo merged 1 commit into
masterfrom
codex/fix-refresh-lockfile-merge-queue
Aug 10, 2026
Merged

fix(ci): support merge queue lockfile refresh#1239
kkroo merged 1 commit into
masterfrom
codex/fix-refresh-lockfile-merge-queue

Conversation

@kkroo

@kkroo kkroo commented Aug 10, 2026

Copy link
Copy Markdown

Summary

  • make the lockfile-refresh merge call compatible with the repository merge queue
  • retain the reusable bot branch instead of asking the CLI to delete it asynchronously

Root cause

Refresh Lockfile run 31341926591 created #1237, then failed because the GitHub CLI rejects --delete-branch when merge queue is enabled.

Validation

  • git diff --check
  • verified no executable gh pr merge invocation retains --delete-branch

Co-Authored-By: Paperclip <noreply@paperclip.ing>
@allyblockcast

allyblockcast Bot commented Aug 10, 2026

Copy link
Copy Markdown

Hey @kkroo! Before this PR can be reviewed, a few things need attention:

Missing or incomplete:

  • Missing section: ## Thinking Path
  • Missing section: ## What Changed
  • Missing section: ## Verification
  • Missing section: ## Risks
  • Missing section: ## Model Used
  • PR body is empty — please fill out the PR template
  • PR body is empty — please fill out the PR template
  • No test files detected in this PR — please include a test that verifies the bug fix or new behavior. If this PR genuinely doesn't need a test (e.g. a refactor), please retitle with refactor: prefix.

Once updated, push a new commit and these checks will re-run automatically.

— commitperclip

@kkroo
kkroo marked this pull request as ready for review August 10, 2026 03:55
@cursor

cursor Bot commented Aug 10, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@kkroo
kkroo merged commit 3ce1f59 into master Aug 10, 2026
5 of 18 checks passed
@kkroo
kkroo deleted the codex/fix-refresh-lockfile-merge-queue branch August 10, 2026 03:56

@allyblockcast allyblockcast Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ally — Consolidated PR Review

Lenses: pr-review-toolkit (code, tests, comments, errors, types) + gstack/review + native-codex.
Reviewed head: a7824cf

Looks good. Removing --delete-branch preserves the reusable refresh branch while allowing gh pr merge to hand the generated PR to the repository merge queue.

Critical Issues (0)

Important Issues (0)

Suggestions (0)

Strengths

  • The change is minimal and its comment accurately documents why the branch must remain available for the next lockfile refresh.

Recommended Action

  1. Merge when the queue and required checks permit it.

@allyblockcast allyblockcast left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ally — Consolidated PR Review

Lenses: pr-review-toolkit (code, tests, comments, errors, types) + gstack/review + native-codex.
Reviewed head: a7824cf

Looks good. Removing --delete-branch preserves the reusable refresh branch while allowing gh pr merge to hand the generated PR to the repository merge queue.

Critical Issues (0)

Important Issues (0)

Suggestions (0)

Strengths

  • The change is minimal and its comment accurately documents why the branch must remain available for the next lockfile refresh.

Recommended Action

  1. Merge when the queue and required checks permit it.

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.

2 participants