promote: dev → main (dev behind basic auth at dev.thermograph.org) #112

Merged

admin_emi merged 1 commit from dev into main

2026-07-26 08:06:33 +00:00

admin_emi commented

2026-07-26 07:49:55 +00:00

Owner

Promotes dev → main, deploying to beta (beta.thermograph.org).

Who merges. Centralis, once the required check is green — under the promotion policy main is the agent's call, and a promotion PR left open is worse than one never opened.

Divergence. 1 ahead, 7 behind. 1 commit(s) to carry, but the target has moved on by 7 — a merge commit is required and conflicts are possible
Not fast-forwardable: the target holds 7 commit(s) the source does not. That is the accumulated design of this release chain, not a mistake anyone just made — every promotion merges the source into the target, which creates a merge commit ON THE TARGET that the source never receives, so each promotion widens the gap it just closed. Expect --ff-only to fail with "diverging branches"; the promotion is a merge commit.

Predicted conflicts.

infra/deploy/Caddyfile.vps1 — edited on both sides
infra/deploy/RUNBOOK-vps1-vps2-cutover.md — edited on both sides
infra/deploy/env-topology.sh — edited on both sides
infra/deploy/provision-dev.sh — edited on both sides
infra/docker-compose.dev.yml — edited on both sides

Commits (1).

4122f435 dev: serve at dev.thermograph.org behind basic auth, bound to loopback (#111)

Merge with a merge commit, not a squash or a fast-forward. main runs ahead of dev from earlier promotions, so --ff-only fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new. (Making promotions fast-forward-only is an open question, not current policy — it needs a one-time history reconciliation on the protected branches first.)

Promotes `dev` → `main`, deploying to beta (beta.thermograph.org). **Who merges.** Centralis, once the required check is green — under the promotion policy `main` is the agent's call, and a promotion PR left open is worse than one never opened. **Divergence.** 1 ahead, 7 behind. 1 commit(s) to carry, but the target has moved on by 7 — a merge commit is required and conflicts are possible Not fast-forwardable: the target holds 7 commit(s) the source does not. That is the accumulated design of this release chain, not a mistake anyone just made — every promotion merges the source into the target, which creates a merge commit ON THE TARGET that the source never receives, so each promotion widens the gap it just closed. Expect `--ff-only` to fail with "diverging branches"; the promotion is a merge commit. **Predicted conflicts.** - `infra/deploy/Caddyfile.vps1` — edited on both sides - `infra/deploy/RUNBOOK-vps1-vps2-cutover.md` — edited on both sides - `infra/deploy/env-topology.sh` — edited on both sides - `infra/deploy/provision-dev.sh` — edited on both sides - `infra/docker-compose.dev.yml` — edited on both sides **Commits (1).** - 4122f435 dev: serve at dev.thermograph.org behind basic auth, bound to loopback (#111) **Merge with a merge commit, not a squash or a fast-forward.** `main` runs ahead of `dev` from earlier promotions, so `--ff-only` fails with "diverging branches", and squashing would rewrite the shared history so the next promotion sees every prior commit as new. (Making promotions fast-forward-only is an open question, not current policy — it needs a one-time history reconciliation on the protected branches first.)

admin_emi added 1 commit 2026-07-26 07:49:57 +00:00