promote: main → release #93

Merged

admin_emi merged 15 commits from main into release 2026-07-25 17:24:13 +00:00

Conversation 0 Commits 15 Files changed 37 +1243 -1372

admin_emi commented 2026-07-25 17:15:03 +00:00

Owner

Copy link

Promotes main → release, deploying to prod (thermograph.org).

Who merges. The owner. This hop deploys to prod and the decision is theirs; Centralis prepared it and stops here.

Divergence. 15 ahead, 12 behind. 15 commit(s) to carry, but the target has moved on by 12 — a merge commit is required and conflicts are possible
Not fast-forwardable: the target holds 12 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.

• .forgejo/workflows/backend-build-push.yml — modify/delete, git will stop here
• .forgejo/workflows/backend-deploy-dev.yml — modify/delete, git will stop here
• .forgejo/workflows/backend-deploy-prod.yml — modify/delete, git will stop here
• .forgejo/workflows/backend-deploy.yml — modify/delete, git will stop here
• .forgejo/workflows/frontend-build-push.yml — modify/delete, git will stop here
• .forgejo/workflows/frontend-deploy-dev.yml — modify/delete, git will stop here
• .forgejo/workflows/frontend-deploy-prod.yml — modify/delete, git will stop here
• .forgejo/workflows/frontend-deploy.yml — modify/delete, git will stop here
• backend/data/climate.py — edited on both sides
• backend/tests/data/test_climate.py — edited on both sides
• backend/web/app.py — edited on both sides
• infra/.gitignore — edited on both sides
• infra/deploy/deploy-dev.sh — edited on both sides
• infra/deploy/forgejo/README.md — edited on both sides
• infra/deploy/forgejo/register-lan-runner.sh — edited on both sides
• infra/deploy/render-secrets.sh — edited on both sides
• infra/docker-compose.dev.yml — edited on both sides
• infra/docker-compose.yml — edited on both sides
• observability/CLAUDE.md — edited on both sides

Commits (15).

• aa4ee7f4 Merge pull request 'promote: dev → main (CI consolidation, 15 workflows → 9)' (#90) from dev into main
• d4a00099 climate: stop dropping the current day from the Open-Meteo bundle (#92)
• 52cfe5b7 Merge pull request 'Merge main back into dev to reconcile the squash-promotion divergence' (#91) from sync/main-into-dev into dev
• be4aa940 Merge main back into dev to reconcile the squash-promotion divergence
• d42a57a0 ci: collapse the eight deploy and build-push workflows into two (#87)
• dde2cdd6 infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85)
• 7307a7aa guardrails: enforce live-host and secrets policy with hooks (#82)
• 1acf8414 docs: rewrite the agent context layer to match the live system (#81)
• bee5b215 infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84)
• 9b6b12a5 infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85)
• fbdfebf8 guardrails: enforce live-host and secrets policy with hooks (#82)
• e84b1f79 docs: rewrite the agent context layer to match the live system (#81)
• 2c7ceefa infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84)
• be88987d Merge pull request 'promote: dev → main' (#83) from dev into main
• a4ecb514 web/worker: add a process-level liveness heartbeat (#80)

Merge with a merge commit, not a squash or a fast-forward. release runs ahead of main 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 `main` → `release`, deploying to prod (thermograph.org). **Who merges.** The owner. This hop deploys to prod and the decision is theirs; Centralis prepared it and stops here. **Divergence.** 15 ahead, 12 behind. 15 commit(s) to carry, but the target has moved on by 12 — a merge commit is required and conflicts are possible Not fast-forwardable: the target holds 12 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.** - `.forgejo/workflows/backend-build-push.yml` — modify/delete, git will stop here - `.forgejo/workflows/backend-deploy-dev.yml` — modify/delete, git will stop here - `.forgejo/workflows/backend-deploy-prod.yml` — modify/delete, git will stop here - `.forgejo/workflows/backend-deploy.yml` — modify/delete, git will stop here - `.forgejo/workflows/frontend-build-push.yml` — modify/delete, git will stop here - `.forgejo/workflows/frontend-deploy-dev.yml` — modify/delete, git will stop here - `.forgejo/workflows/frontend-deploy-prod.yml` — modify/delete, git will stop here - `.forgejo/workflows/frontend-deploy.yml` — modify/delete, git will stop here - `backend/data/climate.py` — edited on both sides - `backend/tests/data/test_climate.py` — edited on both sides - `backend/web/app.py` — edited on both sides - `infra/.gitignore` — edited on both sides - `infra/deploy/deploy-dev.sh` — edited on both sides - `infra/deploy/forgejo/README.md` — edited on both sides - `infra/deploy/forgejo/register-lan-runner.sh` — edited on both sides - `infra/deploy/render-secrets.sh` — edited on both sides - `infra/docker-compose.dev.yml` — edited on both sides - `infra/docker-compose.yml` — edited on both sides - `observability/CLAUDE.md` — edited on both sides **Commits (15).** - aa4ee7f4 Merge pull request 'promote: dev → main (CI consolidation, 15 workflows → 9)' (#90) from dev into main - d4a00099 climate: stop dropping the current day from the Open-Meteo bundle (#92) - 52cfe5b7 Merge pull request 'Merge main back into dev to reconcile the squash-promotion divergence' (#91) from sync/main-into-dev into dev - be4aa940 Merge main back into dev to reconcile the squash-promotion divergence - d42a57a0 ci: collapse the eight deploy and build-push workflows into two (#87) - dde2cdd6 infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85) - 7307a7aa guardrails: enforce live-host and secrets policy with hooks (#82) - 1acf8414 docs: rewrite the agent context layer to match the live system (#81) - bee5b215 infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84) - 9b6b12a5 infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85) - fbdfebf8 guardrails: enforce live-host and secrets policy with hooks (#82) - e84b1f79 docs: rewrite the agent context layer to match the live system (#81) - 2c7ceefa infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84) - be88987d Merge pull request 'promote: dev → main' (#83) from dev into main - a4ecb514 web/worker: add a process-level liveness heartbeat (#80) **Merge with a merge commit, not a squash or a fast-forward.** `release` runs ahead of `main` 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 15 commits 2026-07-25 17:15:06 +00:00

web/worker: add a process-level liveness heartbeat (#80) a4ecb51401

Merge pull request 'promote: dev → main' (#83) from dev into main be88987d95

infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84) 2c7ceefab4

docs: rewrite the agent context layer to match the live system (#81) e84b1f7937

guardrails: enforce live-host and secrets policy with hooks (#82) fbdfebf873

infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85) 9b6b12a5da

infra/forgejo: give the LAN runner's PATH ~/.local/bin (#84) bee5b21587

docs: rewrite the agent context layer to match the live system (#81) 1acf8414ff

guardrails: enforce live-host and secrets policy with hooks (#82) 7307a7aadc

infra: mirror LAN dev secrets under $HOME for snap-confined Docker (#85) dde2cdd6e2

ci: collapse the eight deploy and build-push workflows into two (#87) d42a57a011

Merge main back into dev to reconcile the squash-promotion divergence ... be4aa940d9

The dev → main promotion could not merge: `main` sat 22 commits ahead of `dev`
with content dev had never seen, and git found genuine conflicts in CLAUDE.md
and README.md plus modify/delete on the eight workflow files #87 removed.

The cause is that recent promotions were merged with squash rather than "Create
merge commit". A squash replays dev's commits onto main under new SHAs, so the
two branches share content but not history — main appears to have independently
edited the same files, and every subsequent promotion inherits the divergence.
`promote` warns about exactly this.

Resolution: both conflicts take dev's side, not as a default but because main's
side describes workflows that no longer exist (`*-deploy-dev.yml`,
`backend-build-push` and friends). Keeping it would reintroduce the class of
staleness the root CLAUDE.md now forbids — statements naming files that are not
there. The eight deleted workflows stay deleted; the merge result carries the
nine that #87 left behind.

Verified after resolution: no conflict markers anywhere, no unmerged paths, no
document naming a deleted workflow, all nine workflow files parse, and
shellcheck is clean across the tree.

Promotions from here should use "Create merge commit" so this does not recur.

Merge pull request 'Merge main back into dev to reconcile the squash-promotion divergence' (#91) from sync/main-into-dev into dev 52cfe5b77a

climate: stop dropping the current day from the Open-Meteo bundle (#92) d4a00099f2

Merge pull request 'promote: dev → main (CI consolidation, 15 workflows → 9)' (#90) from dev into main aa4ee7f4c4

admin_emi merged commit 90f699ceaf into release 2026-07-25 17:24:13 +00:00

admin_emi referenced this pull request from a commit 2026-07-25 17:24:15 +00:00

promote: main → release (#93)

admin_emi referenced this pull request 2026-07-25 17:47:14 +00:00

alerting: base web/worker liveness on the app heartbeat, not container stdout #94

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

  

Compat/Breaking

Breaking change that won't be backward compatible

  

Kind/Bug

Something is not working

  

Kind/Documentation

Documentation changes

  

Kind/Enhancement

Improve existing functionality

  

Kind/Feature

New functionality

  

Kind/Security

This is security issue

  

Kind/Testing

Issue or pull request related to testing

  

Priority

Critical

The priority is critical

  

Priority

High

The priority is high

  

Priority

Low

The priority is low

  

Priority

Medium

The priority is medium

  

Reviewed

Confirmed

Issue has been confirmed

  

Reviewed

Duplicate

This issue or pull request already exists

  

Reviewed

Invalid

Invalid issue

  

Reviewed

Won't Fix

This issue won't be fixed

  

Status

Abandoned

Somebody has started to work on this but abandoned work

  

Status

Blocked

Something is blocking this issue or pull request

  

Status

Need More Info

Feedback is required to reproduce issue or to continue work

No labels

Compat/Breaking

Kind/Bug

Kind/Documentation

Kind/Enhancement

Kind/Feature

Kind/Security

Kind/Testing

Priority

Critical

Priority

High

Priority

Low

Priority

Medium

Reviewed

Confirmed

Reviewed

Duplicate

Reviewed

Invalid

Reviewed

Won't Fix

Status

Abandoned

Status

Blocked

Status

Need More Info

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Jinemi/thermograph#93

No description provided.