Skip to content

CI: handle merge_group so enabling a dev merge queue is a safe one-click - #1716

Merged
erikdarlingdata merged 1 commit into
devfrom
feature/ci-merge-group
Jul 26, 2026
Merged

CI: handle merge_group so enabling a dev merge queue is a safe one-click#1716
erikdarlingdata merged 1 commit into
devfrom
feature/ci-merge-group

Conversation

@erikdarlingdata

Copy link
Copy Markdown
Owner

Lands the prerequisite #1715's merge-queue recommendation named: without a merge_group trigger, the required build and Darling PostgreSQL tests checks never report inside a queue, so every queued PR stalls - enabling the ruleset before this wiring would brick dev merges. The trigger is INERT until the queue ruleset is enabled (repo setting; suggested settings in #1715's body).

  • Queue runs take the same always-restore path as dev/main pushes: a queue run is the last validation before its result lands on dev, so the docs fast path never engages there.
  • Queue runs get the per-run concurrency group (never cancelled or replaced), same as pushes and releases.
  • Path classification works unchanged in a queue: dorny/paths-filter v4.0.1+ resolves merge_group diffs from the payload's base_sha/head_sha whenever the base input is empty, which is exactly what the filter steps pass for non-push events (verified against dorny's main.ts merge_group branch).

With this merged, the ruleset click is the ONLY remaining step to kill the CHANGELOG-conflict re-push train.

🤖 Generated with Claude Code

Lands the prerequisite #1715's merge-queue recommendation named: without
a merge_group trigger the required 'build' and 'Darling PostgreSQL
tests' checks never report inside a queue, and every queued PR stalls -
enabling the ruleset before this wiring would brick dev merges. The
trigger is inert until the queue ruleset is actually enabled.

Queue runs take the same always-restore path as dev/main pushes (a
queue run is the last validation before its result lands on dev) and
the per-run concurrency group, so they are never cancelled or replaced.
Path classification works unchanged: dorny/paths-filter v4.0.1+
resolves merge_group diffs from the payload's base_sha/head_sha
whenever the base input is empty, which is exactly what the filter
steps pass for non-push events.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@erikdarlingdata
erikdarlingdata merged commit 83b9000 into dev Jul 26, 2026
4 checks passed
@erikdarlingdata
erikdarlingdata deleted the feature/ci-merge-group branch July 26, 2026 21:12
pull Bot pushed a commit to ehtick/PerformanceMonitor that referenced this pull request Jul 29, 2026
…lick does not exist on a personal-account repo

Merge queues are organization-only (public repos on any plan, private on
Enterprise Cloud); creating the recommended ruleset here returns 422
Invalid rule 'merge_queue'. The merge=union .gitattributes alternative is
also out - GitHub's server-side PR merging ignores merge attributes
(community discussion #9288). The merge_group wiring stays: inert, zero
cost, live the day the repo ever moves to an organization.

No separate CHANGELOG entry for this PR: it corrects an [Unreleased]
entry in place - the change IS the changelog.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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