Skip to content

ci: Run CI, CodeQL and the title check in the merge queue - #233

Merged
NathanCummings merged 2 commits into
mainfrom
ci/merge-queue
Oct 29, 2026
Merged

NathanCummings merged 2 commits into
mainfrom
ci/merge-queue

Conversation

@NathanCummings

Copy link
Copy Markdown
Member

Prepares main for a merge queue. Right now branch protection requires a branch to be up to date before it merges, and auto-merge never updates one. So each week the first Dependabot PR to merge leaves the rest behind, and they wait until someone clicks "Update branch". A merge queue tests each PR on top of the latest main and merges it, which replaces that requirement.

  • ci.yml and codeql.yml also run on merge_group, so the required checks and code scanning report for queue entries.
  • The title check skips in the queue (there's no PR title to read there). A skipped job counts as passing.
  • Updated the comment in the Dependabot auto-merge workflow. The workflow itself is unchanged: gh pr merge --auto adds the PR to the queue once one is required.

After this merges, turn on the queue for main: Settings → Branches → main → tick "Require merge queue" (merge method: squash) and untick "Require branches to be up to date before merging". If the queue is switched on before this merges, queue entries wait for checks that never run.

🤖 Generated with Claude Code

@NathanCummings
NathanCummings enabled auto-merge (squash) October 29, 2026 09:15
@NathanCummings
NathanCummings merged commit a97b276 into main Oct 29, 2026
13 checks passed
@NathanCummings
NathanCummings deleted the ci/merge-queue branch October 29, 2026 09:17
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