Skip to content

ci: run the required checks for merge-queue entries - #1020

Merged
Medformatik merged 1 commit into
mainfrom
ci/merge-queue
Nov 16, 2026
Merged

Medformatik merged 1 commit into
mainfrom
ci/merge-queue

Conversation

@Medformatik

Copy link
Copy Markdown
Collaborator

What changed and why

Pull-request runs wait in line because one CI run starts about 30 jobs and the organization may run 20 at once. The recovery database groups (crash-points, configuration-recovery, coordinator-recovery) are 12 of those jobs and about 144 of a full run's roughly 250 job-minutes, and they run on every push to every pull request. This prepares a merge queue so they can run once per merge instead. Nothing changes for current pull requests until the ruleset requires the queue.

  • All five required checks now report for a merge-queue entry. CI, CodeQL and dependency review run for merge_group. Validate conventional commit title and check / record signature report without repeating work that needs a pull request, because every queued pull request already passed them.
  • A queue entry gets the complete validation that main gets. The selector treats merge_group like a push: scope full, every database group, no pull-request-only Docker build.
  • Pull requests can leave the three recovery groups to the queue, switched off for now. The groups are dropped from a pull request's database matrix only when mergeQueueDatabaseGroups in scripts/ci-impact-rollout.json on main lists them. The list is empty in this change. Only those three groups can be listed, the aggregate gate checks shard receipts against the same plan, and a deferral on any other event is rejected.
  • Path-based selection was measured first and rejected: replayed on the last 80 merged pull requests, an import-graph rule would have saved about 12% of the database job time, because these suites start the real API, agent and data-manager.

After this merges: require the merge queue in the main protection ruleset (settings are in the governance runbook), then a one-line follow-up lists the three groups. Main still runs the full suite after each merge; reusing the queue's result there is a possible later step.

Verification

  • The selection step, run locally with a merge_group event, produces scope full, no deferred groups and all 17 database partitions.
  • New tests cover the deferral rules (pull requests only, approved groups only, never on the queue, main, schedule or manual runs) and pin the merge_group trigger, job names and unique concurrency group of the five workflows. The seven CI contract and plan test files pass (88 tests), as do pnpm lint and pnpm check:policy.
  • Not verified: no merge_group run exists until the ruleset requires the queue, so the five workflows' behaviour on that event is untested on GitHub. The dependency-review action is given the queue's base and head commits explicitly; its README documents those inputs for other events but does not name merge_group. The runbook says how to back out if a check stays pending.
  • actionlint and zizmor are not installed locally and run in CI.

Release and upgrade impact

Product impact: ordinary

CI, CodeQL and dependency review run for merge_group, and the title and signature checks report for it, so the main ruleset can require a merge queue. A queue entry gets the complete validation that main gets.

Pull requests can then leave the three recovery database groups to the queue. That is controlled by mergeQueueDatabaseGroups in the rollout policy on main, which stays empty until the queue is required.
@Medformatik Medformatik added the ci Continuous integration and GitHub Actions changes label Nov 16, 2026
@Medformatik Medformatik self-assigned this Nov 16, 2026
@Medformatik
Medformatik merged commit 27919ad into main Nov 16, 2026
6 checks passed
@Medformatik
Medformatik deleted the ci/merge-queue branch November 16, 2026 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci Continuous integration and GitHub Actions changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant