make check runs merge-check.sh, so it and the gate agree (issue 431) #215

Merged
mesh-admin merged 2 commits from fix/431-make-check-runs-what-the-gate-runs into main 2026-10-11 01:20:19 +00:00
Contributor

Fixes novox/hq issue 431 (the controller's make check can never pass: its formatting step reads the vendored code).

What was wrong

make check listed its own steps. Its fmt step ran gofmt -l ., which walks vendor/ and fails on three vendored third-party files that no change here can fix. The repository's real check, merge-check.sh (mesh/repo-check), runs gofmt -l cmd internal examples and passes. So the developer-facing target could never pass, and its vet and test steps never ran through it.

What changes

  • check now raises the throwaway database as before, then runs sh merge-check.sh with MESH_TEST_POSTGRES (already exported by the Makefile) pointing at it, then runs postgres-stop unconditionally and exits with the script's status. The script is the one list of steps, so the two cannot drift again.
  • fmt stays as a quick developer step, now reading cmd internal examples like the script, with a comment that the two lists must match (issue 431).
  • test and vet are unchanged; test stays the honest subset without a database.

Small differences now taken from the script: the suite runs with -count=1, a 30-minute timeout (was 15), -mod=vendor, and without the race detector (said so) when no C compiler is present.

What I ran

  • make fmt before the change: failed, listing the three vendored files (exit 2).
  • make fmt after the change: passes (exit 0).
  • I read the check recipe line by line: postgres runs first; sh merge-check.sh ; status=$$? ; $(MAKE) postgres-stop ; exit $$status keeps the teardown running when the script fails and passes its exit status through.

Not run here

The full make check was not run end to end on purpose: it binds a local port and starts a postgres container on the operator's desktop. mesh/repo-check runs merge-check.sh on the build node. Note: a make -n check dry run executed the recipe line anyway, because it contains $(MAKE) (GNU make runs such lines under -n); the database was not started, so the store tests failed to connect and nothing else was touched. No container was left behind.

Fixes novox/hq issue 431 (the controller's make check can never pass: its formatting step reads the vendored code). ## What was wrong `make check` listed its own steps. Its `fmt` step ran `gofmt -l .`, which walks `vendor/` and fails on three vendored third-party files that no change here can fix. The repository's real check, `merge-check.sh` (`mesh/repo-check`), runs `gofmt -l cmd internal examples` and passes. So the developer-facing target could never pass, and its vet and test steps never ran through it. ## What changes - `check` now raises the throwaway database as before, then runs `sh merge-check.sh` with `MESH_TEST_POSTGRES` (already exported by the Makefile) pointing at it, then runs `postgres-stop` unconditionally and exits with the script's status. The script is the one list of steps, so the two cannot drift again. - `fmt` stays as a quick developer step, now reading `cmd internal examples` like the script, with a comment that the two lists must match (issue 431). - `test` and `vet` are unchanged; `test` stays the honest subset without a database. Small differences now taken from the script: the suite runs with `-count=1`, a 30-minute timeout (was 15), `-mod=vendor`, and without the race detector (said so) when no C compiler is present. ## What I ran - `make fmt` before the change: failed, listing the three vendored files (exit 2). - `make fmt` after the change: passes (exit 0). - I read the `check` recipe line by line: `postgres` runs first; `sh merge-check.sh ; status=$$? ; $(MAKE) postgres-stop ; exit $$status` keeps the teardown running when the script fails and passes its exit status through. ## Not run here The full `make check` was not run end to end on purpose: it binds a local port and starts a postgres container on the operator's desktop. `mesh/repo-check` runs `merge-check.sh` on the build node. Note: a `make -n check` dry run executed the recipe line anyway, because it contains `$(MAKE)` (GNU make runs such lines under `-n`); the database was not started, so the store tests failed to connect and nothing else was touched. No container was left behind.
mesh-admin added 1 commit 2026-10-11 00:33:43 +00:00
Make check run merge-check.sh, so a developer's check and the gate cannot drift
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate pass: builds build-agent → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without (4 of 4 compose)
mesh/repo-check pass: its merge-check.sh passed
5557a01f06
make check listed its own steps, and its gofmt walked vendor/, failing on
third-party files no change could fix; the steps after it never ran. It now
raises the throwaway database and runs the script repo-check runs.
novox/hq issue 431.
Author
Contributor

Delivery novox/mesh-controller@d2e9dc61590f — covered since 2026-10-11T10:14:32Z

Delivery plan — builds build-agent → ace, g14, novox, shanks; no bus step

  • tier 0: build-agent
  • ace: receives build-agent
  • g14: receives build-agent
  • novox: receives build-agent
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves

Transitions

  • 2026-10-11 00:36 (new) → proposed (announced): novox/mesh-controller#215's head announced
  • 2026-10-11 00:42 proposed → checked (checked): the verdict names this commit
  • 2026-10-11 00:42 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-11 01:23 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-11 10:14 published → covered (covered): covered: a later merge that contains it was delivered: novox/mesh-controller@ef551fdfb6 (merged as 0a2e58c0 into main, walk plan-1791686195314774150): build-agent

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

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-controller@d2e9dc61590f` — **covered** since 2026-10-11T10:14:32Z **Delivery plan** — builds build-agent → ace, g14, novox, shanks; no bus step - tier 0: build-agent - ace: receives build-agent - g14: receives build-agent - novox: receives build-agent - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves **Transitions** - 2026-10-11 00:36 (new) → proposed (announced): novox/mesh-controller#215's head announced - 2026-10-11 00:42 proposed → checked (checked): the verdict names this commit - 2026-10-11 00:42 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-11 01:23 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-11 10:14 published → covered (covered): covered: a later merge that contains it was delivered: novox/mesh-controller@ef551fdfb6b2 (merged as 0a2e58c0 into main, walk plan-1791686195314774150): build-agent The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
jschoubben added 1 commit 2026-10-11 00:35:39 +00:00
Inline the check's teardown so make -n check stays a dry run
mesh/merge-gate pass: builds build-agent → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without (4 of 4 compose)
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery covered: a later merge that contains it was delivered: novox/mesh-controller@ef551fdfb6b2 (merged as 0a2e58c0 into main, walk plan-17916861…
d2e9dc6159
GNU make runs a recipe line holding $(MAKE) even under -n, so a dry run of
check ran the whole suite. novox/hq issue 431.
Author
Contributor

Merge check at 5557a01f

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent)
  • mesh/repo-check: PASS — its merge-check.sh passed

Delivery plan — builds build-agent → ace, g14, novox, shanks; no bus step

  • tier 0: build-agent
  • ace: receives build-agent
  • g14: receives build-agent
  • novox: receives build-agent
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves

Run by the build seat on g14 as build-1791678870784049429 (builds --log build-1791678870784049429).

--- the gate: build-agent
judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T00:33:56Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-11T00:33:56Z

machines:
  - a machine (f35): composes
  - holds mesh-dns-resolver (idt): composes
  - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
  - a machine (yvbpsm): composes

a merge would rebuild 1 module(s) in 1 tier(s): build-agent
--- its merge-check.sh (go toolchain)
ok  	github.com/novox/mesh-controller/cmd/mesh-builder	1.027s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	219.913s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.012s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.019s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.012s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.311s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.040s
ok  	github.com/novox/mesh-controller/internal/broker	2.554s
ok  	github.com/novox/mesh-controller/internal/builder	2.358s
ok  	github.com/novox/mesh-controller/internal/catalogue	4.380s
ok  	github.com/novox/mesh-controller/internal/conditions	2.340s
ok  	github.com/novox/mesh-controller/internal/envfile	1.024s
ok  	github.com/novox/mesh-controller/internal/facts	1.027s
ok  	github.com/novox/mesh-controller/internal/identity	3.967s
ok  	github.com/novox/mesh-controller/internal/inventory	74.875s
ok  	github.com/novox/mesh-controller/internal/lease	17.695s
ok  	github.com/novox/mesh-controller/internal/licences	3.619s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.008s
ok  	github.com/novox/mesh-controller/internal/link	51.394s
ok  	github.com/novox/mesh-controller/internal/lint	1.993s
ok  	github.com/novox/mesh-controller/internal/outward	1.038s
ok  	github.com/novox/mesh-controller/internal/overlay	1.023s
ok  	github.com/novox/mesh-controller/internal/secrets	1.398s
ok  	github.com/novox/mesh-controller/internal/store	3.133s
ok  	github.com/novox/mesh-controller/internal/testbus	1.171s
ok  	github.com/novox/mesh-controller/internal/token	1.020s
**Merge check** at `5557a01f` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent) - `mesh/repo-check`: **PASS** — its merge-check.sh passed **Delivery plan** — builds build-agent → ace, g14, novox, shanks; no bus step - tier 0: build-agent - ace: receives build-agent - g14: receives build-agent - novox: receives build-agent - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves Run by the build seat on g14 as `build-1791678870784049429` (`builds --log build-1791678870784049429`). ``` --- the gate: build-agent judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T00:33:56Z says they run composing every machine as the mesh is the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued composing every machine with the change the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose) judged by controller development build against the facts of 2026-10-11T00:33:56Z machines: - a machine (f35): composes - holds mesh-dns-resolver (idt): composes - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes - a machine (yvbpsm): composes a merge would rebuild 1 module(s) in 1 tier(s): build-agent --- its merge-check.sh (go toolchain) ok github.com/novox/mesh-controller/cmd/mesh-builder 1.027s ok github.com/novox/mesh-controller/cmd/mesh-controller 219.913s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.012s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.019s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.012s ok github.com/novox/mesh-controller/examples/route-proxy 1.311s ok github.com/novox/mesh-controller/internal/artifacts 1.040s ok github.com/novox/mesh-controller/internal/broker 2.554s ok github.com/novox/mesh-controller/internal/builder 2.358s ok github.com/novox/mesh-controller/internal/catalogue 4.380s ok github.com/novox/mesh-controller/internal/conditions 2.340s ok github.com/novox/mesh-controller/internal/envfile 1.024s ok github.com/novox/mesh-controller/internal/facts 1.027s ok github.com/novox/mesh-controller/internal/identity 3.967s ok github.com/novox/mesh-controller/internal/inventory 74.875s ok github.com/novox/mesh-controller/internal/lease 17.695s ok github.com/novox/mesh-controller/internal/licences 3.619s ok github.com/novox/mesh-controller/internal/licences/adapters 1.008s ok github.com/novox/mesh-controller/internal/link 51.394s ok github.com/novox/mesh-controller/internal/lint 1.993s ok github.com/novox/mesh-controller/internal/outward 1.038s ok github.com/novox/mesh-controller/internal/overlay 1.023s ok github.com/novox/mesh-controller/internal/secrets 1.398s ok github.com/novox/mesh-controller/internal/store 3.133s ok github.com/novox/mesh-controller/internal/testbus 1.171s ok github.com/novox/mesh-controller/internal/token 1.020s ```
Author
Contributor

Merge check at d2e9dc61

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent)
  • mesh/repo-check: PASS — its merge-check.sh passed

Delivery plan — builds build-agent → ace, g14, novox, shanks; no bus step

  • tier 0: build-agent
  • ace: receives build-agent
  • g14: receives build-agent
  • novox: receives build-agent
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves

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

--- the gate: build-agent
judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T00:35:35Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-11T00:35:35Z

machines:
  - a machine (f35): composes
  - holds mesh-dns-resolver (idt): composes
  - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
  - a machine (yvbpsm): composes

a merge would rebuild 1 module(s) in 1 tier(s): build-agent
--- its merge-check.sh (go toolchain)
ok  	github.com/novox/mesh-controller/cmd/mesh-builder	1.039s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	206.138s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.016s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.019s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.014s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.132s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.043s
ok  	github.com/novox/mesh-controller/internal/broker	2.733s
ok  	github.com/novox/mesh-controller/internal/builder	2.744s
ok  	github.com/novox/mesh-controller/internal/catalogue	4.767s
ok  	github.com/novox/mesh-controller/internal/conditions	2.521s
ok  	github.com/novox/mesh-controller/internal/envfile	1.057s
ok  	github.com/novox/mesh-controller/internal/facts	1.094s
ok  	github.com/novox/mesh-controller/internal/identity	4.476s
ok  	github.com/novox/mesh-controller/internal/inventory	81.174s
ok  	github.com/novox/mesh-controller/internal/lease	17.703s
ok  	github.com/novox/mesh-controller/internal/licences	3.979s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.089s
ok  	github.com/novox/mesh-controller/internal/link	52.097s
ok  	github.com/novox/mesh-controller/internal/lint	2.167s
ok  	github.com/novox/mesh-controller/internal/outward	1.116s
ok  	github.com/novox/mesh-controller/internal/overlay	1.105s
ok  	github.com/novox/mesh-controller/internal/secrets	1.500s
ok  	github.com/novox/mesh-controller/internal/store	3.406s
ok  	github.com/novox/mesh-controller/internal/testbus	1.235s
ok  	github.com/novox/mesh-controller/internal/token	1.019s
**Merge check** at `d2e9dc61` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent) - `mesh/repo-check`: **PASS** — its merge-check.sh passed **Delivery plan** — builds build-agent → ace, g14, novox, shanks; no bus step - tier 0: build-agent - ace: receives build-agent - g14: receives build-agent - novox: receives build-agent - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves Run by the build seat on ace as `build-1791678966094883166` (`builds --log build-1791678966094883166`). ``` --- the gate: build-agent judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T00:35:35Z says they run composing every machine as the mesh is the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued composing every machine with the change the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose) judged by controller development build against the facts of 2026-10-11T00:35:35Z machines: - a machine (f35): composes - holds mesh-dns-resolver (idt): composes - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes - a machine (yvbpsm): composes a merge would rebuild 1 module(s) in 1 tier(s): build-agent --- its merge-check.sh (go toolchain) ok github.com/novox/mesh-controller/cmd/mesh-builder 1.039s ok github.com/novox/mesh-controller/cmd/mesh-controller 206.138s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.016s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.019s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.014s ok github.com/novox/mesh-controller/examples/route-proxy 1.132s ok github.com/novox/mesh-controller/internal/artifacts 1.043s ok github.com/novox/mesh-controller/internal/broker 2.733s ok github.com/novox/mesh-controller/internal/builder 2.744s ok github.com/novox/mesh-controller/internal/catalogue 4.767s ok github.com/novox/mesh-controller/internal/conditions 2.521s ok github.com/novox/mesh-controller/internal/envfile 1.057s ok github.com/novox/mesh-controller/internal/facts 1.094s ok github.com/novox/mesh-controller/internal/identity 4.476s ok github.com/novox/mesh-controller/internal/inventory 81.174s ok github.com/novox/mesh-controller/internal/lease 17.703s ok github.com/novox/mesh-controller/internal/licences 3.979s ok github.com/novox/mesh-controller/internal/licences/adapters 1.089s ok github.com/novox/mesh-controller/internal/link 52.097s ok github.com/novox/mesh-controller/internal/lint 2.167s ok github.com/novox/mesh-controller/internal/outward 1.116s ok github.com/novox/mesh-controller/internal/overlay 1.105s ok github.com/novox/mesh-controller/internal/secrets 1.500s ok github.com/novox/mesh-controller/internal/store 3.406s ok github.com/novox/mesh-controller/internal/testbus 1.235s ok github.com/novox/mesh-controller/internal/token 1.019s ```
mesh-admin merged commit fbc7bc976b into main 2026-10-11 01:20:19 +00:00
mesh-admin deleted branch fix/431-make-check-runs-what-the-gate-runs 2026-10-11 01:20:20 +00:00
This repo is archived. You cannot comment on pull requests.
No Reviewers
2 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-controller#215