Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -529,9 +529,11 @@ required checks. While the project has one active maintainer, no independent
approval is mandatory. Resolve review threads after fixing the finding,
explaining why it does not apply, or agreeing on a follow-up.

Branches do not have to be updated after every merge to `main`. Post-merge CI
still checks the combined result; repair a failing `main` before unrelated
merges continue. Administrator bypass is reserved for documented emergencies
Branches do not have to be updated after every merge to `main`. Merge with
**Merge when ready**: the merge queue tests the pull request on top of `main`,
including the recovery database groups that pull-request runs leave out, and
merges it when that passes. Post-merge CI checks the result again; repair a
failing `main` before unrelated merges continue. Administrator bypass is reserved for documented emergencies
through a PR. See the [protection runbook](docs/docs/developer/repository-governance.md)
for required checks and recovery.

Expand Down
8 changes: 5 additions & 3 deletions docs/docs/developer/ci-performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,11 @@ those three groups can be listed. The plan records the result as
the same plan and rejects a deferral on any event other than `pull_request`.
Merge-queue, `main`, scheduled and manual runs always run every group.

The list is empty until the ruleset requires the merge queue. With the list set
and no queue, a recovery regression would be found on `main` after the merge
instead of before it.
The ruleset requires the merge queue since 16 November 2026 and the list names
all three groups. A pull request that breaks one of them passes its own run and
is refused by the queue. Empty the list before removing the queue requirement:
with the list set and no queue, a recovery regression would be found on `main`
after the merge instead of before it.

## Stopping a pull request's run after a lint failure

Expand Down
20 changes: 10 additions & 10 deletions docs/docs/developer/repository-governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ Only squash merges are allowed. The PR title and body become the default
squash commit message; review both and preserve attribution and trailers.

Required checks use the loose policy: branches do not need updating after each
merge to `main`. A [merge queue](#merge-queue) is prepared but not yet required.
Post-merge CI checks the combined result and gates image publication. Repair a failing `main` before continuing
unrelated merges.
merge to `main`. Merges go through the [merge queue](#merge-queue), which tests
the combined result before `main` moves. Post-merge CI checks it again and gates
image publication. Repair a failing `main` before continuing unrelated merges.

The required title check also validates current release classification using trusted
default-branch code and candidate Git objects only. Metadata edits refresh that
Expand Down Expand Up @@ -87,26 +87,26 @@ complete validation that main gets; `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.

Enable it in the `main protection` ruleset with **Require merge queue**:
The `main protection` ruleset requires the queue since 16 November 2026:

| Setting | Value | Reason |
| -------------------- | ---------- | ----------------------------------------------------------------------- |
| Merge method | Squash | The only allowed method. |
| Build concurrency | 2 | Two entries fit beside pull-request runs under the hosted-runner limit. |
| Maximum group size | 1 | Each pull request passes or fails on its own. |
| Maximum group size | 3 | Passing entries may land together. |
| Require all entries | On | Each pull request passes or fails on its own. |
| Status check timeout | 90 minutes | The longest database job timeout. |

Then merge with **Merge when ready** or `gh pr merge`. A failing entry leaves
Merge with **Merge when ready** or `gh pr merge`. A failing entry leaves
the queue and `main` does not move.

Once the queue is required, pull requests may leave the recovery database groups
to it. List them in `mergeQueueDatabaseGroups` in `scripts/ci-impact-rollout.json`;
only the copy on `main` is read. See
Pull requests leave the recovery database groups to the queue. They are listed
in `mergeQueueDatabaseGroups` in `scripts/ci-impact-rollout.json`; only the copy
on `main` is read. See
[Measuring CI performance](ci-performance.md#merge-queue-and-deferred-database-groups).
Empty that list before removing the queue requirement, otherwise those groups
run only after a merge.

The queue's `merge_group` runs have not been observed on this repository yet.
If a required check stays pending for an entry, remove the queue requirement
from the ruleset, merge the fix the previous way and enable it again.

Expand Down
3 changes: 1 addition & 2 deletions scripts/ci-impact-plan.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ describe("CI applicability and required result enforcement", () => {
expect(rollout.version).toBe(1);
expect(rollout.approvedScopes).toEqual(["docs", "web", "mobile", "client"]);
for (const scope of rollout.approvedScopes) expect(selectiveScopes).toContain(scope);
for (const group of rollout.mergeQueueDatabaseGroups)
expect(mergeQueueDatabaseGroups).toContain(group);
expect(rollout.mergeQueueDatabaseGroups).toEqual(mergeQueueDatabaseGroups);
});
it("leaves approved database groups to the merge queue on pull requests only", () => {
const matrix = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-impact-rollout.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"approvedScopes": ["docs", "web", "mobile", "client"],
"mergeQueueDatabaseGroups": []
"mergeQueueDatabaseGroups": ["crash-points", "configuration-recovery", "coordinator-recovery"]
}
Loading