down-merge release into main (unblocks the prod promotion) #140

Merged

admin_emi merged 18 commits from chore/downmerge-release-to-main into main 2026-08-01 14:46:47 +00:00

Conversation 0 Commits 18 Files changed -

admin_emi commented 2026-08-01 14:29:39 +00:00

Owner

Copy link

release carried four commits that never came back to main: the onboarding guide (a23c667), its follow-up fixes (18f50ad, #99) and two alerting fixes (9b0fae5 #94, 1f9a6f0 #96). Because release was therefore not an ancestor of main, main -> release could not merge under any style — that is the cause of #132 reporting mergeable=false.

The merged tree is byte-identical to main: all four changes had already reached main independently, so this PR changes no files. It only restores ancestry, after which main -> release fast-forwards.

Conflicts were add/add on docs/onboarding/* and one comment line in observability/grafana/provisioning/alerting/rules-prod.yml, all resolved to main. release copies of the onboarding guide predate the vps1/vps2 cutover and still describe beta on vps1, dev on the desktop and Forgejo co-located with beta.

BRANCHING.md requires this down-merge in the same session as the hotfix; that was missed at the time.

release carried four commits that never came back to main: the onboarding guide (a23c667), its follow-up fixes (18f50ad, #99) and two alerting fixes (9b0fae5 #94, 1f9a6f0 #96). Because release was therefore not an ancestor of main, main -> release could not merge under any style — that is the cause of #132 reporting mergeable=false. The merged tree is byte-identical to main: all four changes had already reached main independently, so this PR changes no files. It only restores ancestry, after which main -> release fast-forwards. Conflicts were add/add on docs/onboarding/* and one comment line in observability/grafana/provisioning/alerting/rules-prod.yml, all resolved to main. release copies of the onboarding guide predate the vps1/vps2 cutover and still describe beta on vps1, dev on the desktop and Forgejo co-located with beta. BRANCHING.md requires this down-merge in the same session as the hotfix; that was missed at the time.

admin_emi added 18 commits 2026-08-01 14:29:40 +00:00

Merge pull request 'Promote main to release (domain-sha tag keying)' (#5) from main into release 46e3163420

Merge pull request 'Promote main to release (tag-keying remainder)' (#8) from main into release 11a5e59797

Merge pull request 'Promote main to release (deploy prod): Open-Meteo migration' (#12) from main into release 7d6b7850a1

Merge pull request 'Promote main to release (deploy prod): ERA5 lake stack + Go daemon' (#29) from main into release f8481ecf70

Merge pull request 'Promote main to release: lake extension bake + daemon healthcheck fixes' (#32) from main into release 372813b67b

Merge pull request 'Promote main to release: daemon roll + Iceberg-backed lake query' (#42) from main into release a3a1209645

Merge pull request 'Promote main to release: Iceberg-backed lake query' (#46) from main into release b1b97e7c7d

Merge pull request 'Promote main to release: geocode P0 fix + ops tooling + privacy logging' (#53) from main into release 4daa10c76d

Merge pull request 'Promote main to release: first alerting + Postfix supervision' (#61) from main into release 67996d5b77

Merge pull request 'Promote main to release: MET forecast coverage gate' (#65) from main into release 66f2cf0dfe

Merge pull request 'Promote main to release: NASA retirement' (#74) from main into release 51889d6979

Merge pull request 'Promote main to release: vault consolidation, dev + Centralis vaults' (#79) from main into release 4fce9e1540

promote: main → release (#93) ... 90f699ceaf

Reviewed-on: https://git.thermograph.org/emi/thermograph/pulls/93

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

alerting: don't print a bare "value:" when ValueString is empty (#96) 1f9a6f0917

docs: add a developer onboarding guide for the monorepo ... a23c66741c

Twelve documents under docs/onboarding/ covering orientation, local setup,
the repo map, per-domain deep dives, the cross-service contracts, CI and the
release flow, infra and secrets, observability, task recipes, and a list of
which docs in this tree are currently stale.

Every command in the setup guide was run against this checkout: the backend
suite (429 passed, 8 skipped), the frontend Go suite, a venv boot of the
backend, and a build+boot of the Go frontend.

Two findings recorded along the way:

- static/units.js's F_REGIONS is guarded by no test, despite three source
  comments claiming "a test asserts all three stay identical". The Go test
  only cross-checks the Go copy against the backend's Python. All four copies
  are currently identical.
- backend/ and frontend/docker-compose.test.yml still default to the retired
  emi/thermograph-backend/app image path, and the frontend harness pins the
  split-era v0.0.2-split-ci tag.

Claude-Session: https://claude.ai/code/session_01AfXqHrxCJLs2D7hpQkiUiJ

frontend: fix the three inconsistencies the onboarding guide found (#99) 18f50ad09b

Merge branch 'release' into main ... 90142cebbf

Reconciles the four commits that landed on release via the hotfix path and
were never down-merged: the onboarding guide (a23c667), its follow-up fixes
(18f50ad, #99), and two alerting fixes (9b0fae5 #94, 1f9a6f0 #96).

The resulting tree is byte-identical to main — every one of those changes
already reached main independently, so this carries no content. What it
carries is ancestry: release was not an ancestor of main, which made
main -> release unmergeable under any merge style and is why #132 reported
mergeable=false.

Conflicts were add/add on docs/onboarding/* and one comment line in
observability/grafana/provisioning/alerting/rules-prod.yml. All resolved to
main's side: release's copies predate the vps1/vps2 cutover and still
describe beta on vps1, dev on the desktop, and Forgejo co-located with beta.

BRANCHING.md requires this down-merge in the same session as the hotfix.
That step was missed; this closes it.

admin_emi merged commit 90142cebbf into main 2026-08-01 14:46:47 +00:00

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#140

No description provided.