Release 57: bring main into the integration branch #322

Closed

mesh-admin wants to merge 16 commits from main into feat/57-config-and-provisioning

pull from: main

merge into: :feat/57-config-and-provisioning

:main

:fix/701-a-name-nothing-answers-is-not-used

:fix/270-a-dead-bus-watch-is-heard

:feat/57-config-and-provisioning

:pkg/57-f3-assignment-buckets

:fix/630-config-values-from-four-sources

:fix/624-a-bundles-secrets-belong-to-its-runtime

:fix/613-node-smb-server

:feat/328-libraries-and-module-users

:feat/325-identities-and-kept-folders

:fix/345-reminder-test

:feat/bus-view-principal

:fix/383-a-proposal-reads-whole-on-the-phone

:feat/the-controller-asks-the-operator

:test/plan-diff-left-out-line

:fix/the-forges-first-rule-and-a-kept-identity

:fix/the-registry-trust-test-reads-the-runtimes-module

:fix/the-runtime-file-is-the-runtimes

:fix/issue-211-a-bundle-stands-on-its-toolchain

:feat/build-edges-are-recorded

:fix/several-contributions-collide-in-grants-v2

Conversation 2 Commits 16 Files Changed 32

+2472 -67

mesh-admin commented 2026-10-14 05:25:58 +00:00

Contributor

Copy Link

Copy Source

Merges mesh-controller's main into feat/57-config-and-provisioning so the release branch carries what main gained since it opened (among them #319, whose store tests the merge check's drop check now expects). It adds no new code: everything here was reviewed and merged on main. Merged only with both checks green; conflicts, if any, are resolved in a reviewed follow-up instead.

Merges mesh-controller's main into feat/57-config-and-provisioning so the release branch carries what main gained since it opened (among them #319, whose store tests the merge check's drop check now expects). It adds no new code: everything here was reviewed and merged on main. Merged only with both checks green; conflicts, if any, are resolved in a reviewed follow-up instead.

mesh-admin added 16 commits 2026-10-14 05:25:58 +00:00

Test that the rest go at once after the first passes and a gate survives a new controller (hq ADR 0353) ... b03d257f81

The release walked four machines one after another in eleven minutes, and a
new controller re-sent and re-judged a build its machine already ran.

Send the rest at once after the first passes, and resume a stored gate (hq ADR 0353) ... c2ea9b4c51

A release now sends every other machine in one step once its first machine
passed, each judged by its own gate; a failing one is put back without
stopping the others, a silent one is left. A send is kept before it is made,
and a machine already sent what a gate is for is not sent again: the gate
counts from that send and takes over another walk's readings of the same
build there.

Keep a walk's sends to what was kept, and say a silent rest (hq ADR 0353 review) ... 2f5cc146fe

A release's own gates held its other sends back for ever; an adopted send
lost what the machine ran before; a kept send could grow a build no gate
passed; a take-over matched by commit alone; a rest that went silent ended
done. The node-engine and the resolver still go one machine at a time, since
a fault that cuts a machine off shows only as silence.

Say a read error of a silent rest, and keep the node-engine one at a time in a kept step (hq ADR 0353) ... b482122d66

An empty answer on a read error would clear release-silent unseen.

Merge pull request 'The rest go at once after the first passes, and a gate survives a new controller (hq ADR 0353)' (#312) from fix/the-rest-in-parallel-and-gates-survive-a-new-controller into main ca3f43c400

A no-move tier waits for no new report, so its walk asks the next tier (issue 648) ... d9b86376d3

A build made from the source every machine running it runs is marked sent
and sent nothing, yet the tier's wait asked each machine for a report after
that marking. None follows, and the walk waited for ever. Each machine is
now judged by whether it answered its last send, the one whose builds made
the build no move.

Test that a branch is tried before its pull request (hq issue 686) ... 8123ca5654

A builder's store tests first ran in the pull request's merge check, a review
round late. These fail on main: a try asks the repository's own check alone,
its outcome sets no status and registers nothing, an unknown ref is refused
before anything is asked, and the answer carries the failing lines.

Try a pushed branch on the build seat before its pull request (hq issue 686) ... 65508d9df9

Store tests skip without a store and no agent may start one, so each failure
cost a 15-30 minute review round. The try verb asks the build seat for the
repository's merge-check.sh on the ref merged into the trunk, as a check in
the build queue, and reads its outcome from the build's log: no status on
the forge, nothing registered, nothing built for a merge.

Share one prefix between the no-move Why's writer and its reader (review of #309, issue 648) 70885ab3c4

Keep a try off the forge and bound how many run (hq issue 686) ... 3ce5a0239b

Review of #314: a try's start named its commit, which the forge's holder
matches to an open pull request's head and marks pending. Its start now
names no repository or commit. One try per commit and four in all, a try
never ages ahead of deliveries or pull request checks, and its id is
checked before it is a bus subject.

Merge pull request 'A no-move tier waits for no new report, so its walk asks the next tier (issue 648)' (#309) from fix/648-a-no-move-tier-waits-for-nothing into main 2d18f438c5

Merge pull request 'Try a pushed branch on the build seat before its pull request (hq issue 686)' (#314) from fix/686-a-branch-is-tested-before-its-pull-request into main df9e5728a9

Link a build's bases into its repository before pushing it (issue 694) ... 8933864a49

A runtime on containerd's image store, the default on a fresh docker 29,
need not hold the compressed layers of a base it built FROM: a layer it
had unpacked already is never fetched. Its push then fails on that layer
although the registry holds it under the base's mirror. A push reads
locally only what the target repository lacks, so mount the base's blobs
there first.

Merge pull request 'Link a build's bases into its repository before pushing it (issue 694)' (#318) from fix/694-a-push-holds-its-bases into main 2959c81435

List the provider-hold tests among the store tests, so a skip cannot pass unseen (hq issue 145) ... cebc593627

The rule 5 test of ADR 0240 (one provider down, three consumers, one
condition) and its healthy-provider twin need the store and skip without
one; unlisted, the merge check passed them without running them.

Merge pull request 'List the provider-hold tests among the store tests (hq issue 145, to-be 48 Phase C)' (#319) from fix/145-a-consumer-is-held-under-its-provider into main 3479a35462

mesh-admin commented 2026-10-14 05:26:26 +00:00

Author

Contributor

Copy Link

Copy Source

Merge check at 3479a354
Judged: head 3479a35462b2 merged into trunk 221fe5a60d1f

• mesh/merge-gate: FAIL — head 3479a35462 does not merge cleanly into trunk 221fe5a60d: in conflict testdata/store-tests
• mesh/repo-check: FAIL — head 3479a35462 does not merge cleanly into trunk 221fe5a60d: in conflict testdata/store-tests

Run by the build seat on ace as build-1791955581688858858 (builds --log build-1791955581688858858).

head 3479a35462b2 does not merge cleanly into trunk 221fe5a60d1f: in conflict testdata/store-tests

**Merge check** at `3479a354` Judged: head `3479a35462b2` merged into trunk `221fe5a60d1f` - `mesh/merge-gate`: **FAIL** — head 3479a35462b2 does not merge cleanly into trunk 221fe5a60d1f: in conflict testdata/store-tests - `mesh/repo-check`: **FAIL** — head 3479a35462b2 does not merge cleanly into trunk 221fe5a60d1f: in conflict testdata/store-tests Run by the build seat on ace as `build-1791955581688858858` (`builds --log build-1791955581688858858`). ``` head 3479a35462b2 does not merge cleanly into trunk 221fe5a60d1f: in conflict testdata/store-tests ```

mesh-admin commented 2026-10-14 05:26:31 +00:00

Author

Contributor

Copy Link

Copy Source

Delivery novox/mesh-controller@3479a35462b2 — stopped since 2026-10-14T06:16:52Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Transitions

• 2026-10-14 05:26 (new) → proposed (announced): novox/mesh-controller#322's head announced
• 2026-10-14 05:26 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit
• 2026-10-14 05:26 checked → rejected (refused): the gate failed or could not run, or the repository's own check failed
• 2026-10-14 06:16 rejected → stopped (closed): the pull request closed unmerged

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-controller@3479a35462b2` — **stopped** since 2026-10-14T06:16:52Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Transitions** - 2026-10-14 05:26 (new) → proposed (announced): novox/mesh-controller#322's head announced - 2026-10-14 05:26 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit - 2026-10-14 05:26 checked → rejected (refused): the gate failed or could not run, or the repository's own check failed - 2026-10-14 06:16 rejected → stopped (closed): the pull request closed unmerged The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.

mesh-admin referenced this pull request 2026-10-14 06:07:35 +00:00

57/K2: The controller reads, judges against and keeps the catalogue's list of predefined keys (issue 661) #323

mesh-admin closed this pull request 2026-10-14 06:08:30 +00:00

mesh-admin referenced this pull request 2026-10-14 06:22:53 +00:00

Release 57: bring main into the integration branch (conflicts resolved) #324

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

jschoubben miel.truyen

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: novox/mesh-controller#322