diff --git a/docs/2-handbook/swarm/services.md b/docs/2-handbook/swarm/services.md index 8f27fa612..a8d181e9f 100644 --- a/docs/2-handbook/swarm/services.md +++ b/docs/2-handbook/swarm/services.md @@ -191,7 +191,7 @@ metrics it exports and the threat model: The swarm builder, in a `swarm-builder` container on the host that sets `deploy.builder.enable`; set it to `false` to opt out. It evaluates and builds unreviewed agent config PRs, and the result shows as a `swarm-builder` commit -status on the PR. The status is required: a red or missing one blocks the +status on the PR. A merge needs that status to pass: a red or missing one blocks the merge. It also builds each agent before the swarm sends its deploy, and a failed build holds that deploy back. The jobs show on the swarm UI's Jobs page. It builds through diff --git a/docs/4-implementation/swarm/builder.md b/docs/4-implementation/swarm/builder.md index 325387ca6..bf9e58001 100644 --- a/docs/4-implementation/swarm/builder.md +++ b/docs/4-implementation/swarm/builder.md @@ -122,7 +122,7 @@ status has no link. host's store until it's collected, so on a host that also runs the hive, the hive's own build can reuse whatever matches. A [meta build](#deploy-gate) can push to [a binary cache](#binary-cache). -- The PR check gates the merge: `swarm-builder` is a required status on every +- The PR check gates the merge: `swarm-builder` is a mandatory status on every config repo's `main`, so a red or missing status blocks it. The [deploy gate](#deploy-gate) is a separate build, from `internal/meta`. - A lost webhook delivery of a PR push isn't retried: the head isn't built until the next @@ -714,7 +714,7 @@ newer push replaces its PR's job while that job is still waiting. The builder builds that config at the PR's head on the agent base its own host runs, through the host's nix daemon, and swarm-controller writes the result as a `swarm-builder` commit status on the head. The job shows on the swarm UI's Jobs page. The -status is required on `main`: a red or missing one blocks the merge. +status must pass before a merge to `main`: a red or missing one blocks it. Separately, the builder builds each agent from `internal/meta` before the swarm sends its deploy, and a failed or unpushed build holds that deploy back (`build_meta` job;