upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYour Name <you@example.com>2026-05-19 04:12:25 +0530
committerYour Name <you@example.com>2026-05-19 04:12:25 +0530
commit77031f06a9a87320d011f501590985161d1eb305 (patch)
tree656b06968df74847ea52aa2411dd42ccf13c78b6
parent2d78aadfd603fab9a9342b1281ad1d46ad82cf1d (diff)
docs: mark merge plan checklist complete
-rw-r--r--RELAY_HARDENING_MERGE.md44
1 files changed, 22 insertions, 22 deletions
diff --git a/RELAY_HARDENING_MERGE.md b/RELAY_HARDENING_MERGE.md
index 036a96d..c17c9c6 100644
--- a/RELAY_HARDENING_MERGE.md
+++ b/RELAY_HARDENING_MERGE.md
@@ -42,32 +42,32 @@ Master at `abee221` is **broken** — the `eeb9d2d` commit (from cvm-relay-stabi
42- [x] Create backup branch `feature/relay-hardening-backup` 42- [x] Create backup branch `feature/relay-hardening-backup`
43 43
44### Step 2: Compose Final State 44### Step 2: Compose Final State
45- [ ] Soft-reset hardening worktree to master 45- [x] Soft-reset hardening worktree to master
46- [ ] Restore `main/CMakeLists.txt` from `81f2dc5` (has all source files and deps) 46- [x] Restore `main/CMakeLists.txt` from `81f2dc5` (has all source files and deps)
47- [ ] Restore `main/tollgate_main.c` from `81f2dc5` (has display + relay includes and calls) 47- [x] Restore `main/tollgate_main.c` from `81f2dc5` (has display + relay includes and calls)
48- [ ] Keep `main/cvm_server.c` from master (has keepalive/timeout fixes) 48- [x] Keep `main/cvm_server.c` from master (has keepalive/timeout fixes)
49- [ ] Keep `main/display.c` with non-static `escape_wifi_field` 49- [x] Keep `main/display.c` with non-static `escape_wifi_field`
50- [ ] Stage new files: `negentropy_adapter.c/h`, `test_display.c`, `test_negentropy_adapter.c`, `test-cvm-roundtrip.mjs`, `test-cross-board.mjs`, `RELAY_HARDENING_PLAN.md` 50- [x] Stage new files: `negentropy_adapter.c/h`, `test_display.c`, `test_negentropy_adapter.c`, `test-cvm-roundtrip.mjs`, `test-cross-board.mjs`, `RELAY_HARDENING_PLAN.md`
51- [ ] Stage updated files: `Makefile`, `AGENTS.md`, `tests/unit/Makefile` 51- [x] Stage updated files: `Makefile`, `AGENTS.md`, `tests/unit/Makefile`
52- [ ] Delete `CHECKLIST-CVM-RELAY.md` 52- [x] Delete `CHECKLIST-CVM-RELAY.md`
53- [ ] Delete `PLAN-SQUASH-MERGE.md` 53- [x] Delete `PLAN-SQUASH-MERGE.md`
54- [ ] Keep `test-cvm-mcp-relay.mjs` (from master) 54- [x] Keep `test-cvm-mcp-relay.mjs` (from master)
55- [ ] Keep `components/esp-miner` removed (from master) 55- [x] Keep `components/esp-miner` removed (from master)
56 56
57### Step 3: Verify 57### Step 3: Verify
58- [ ] `git diff --cached --stat` matches expected file list 58- [x] `git diff --cached --stat` matches expected file list
59- [ ] `git diff --cached -- main/cvm_server.c` shows master's keepalive version 59- [x] `git diff --cached -- main/cvm_server.c` shows master's keepalive version
60- [ ] `git diff --cached -- main/CMakeLists.txt` shows all source files restored 60- [x] `git diff --cached -- main/CMakeLists.txt` shows all source files restored
61- [ ] `git diff --cached -- main/tollgate_main.c` shows display + relay includes restored 61- [x] `git diff --cached -- main/tollgate_main.c` shows display + relay includes restored
62- [ ] No `components/esp-miner` in staged diff 62- [x] No `components/esp-miner` in staged diff
63- [ ] `make test-unit` passes (all 63+ tests) 63- [x] `make test-unit` passes (all 63+ tests)
64 64
65### Step 4: Commit + Merge 65### Step 4: Commit + Merge
66- [ ] Create single squash commit on hardening branch 66- [x] Create single squash commit on hardening branch
67- [ ] Fast-forward merge to master 67- [x] Fast-forward merge to master
68- [ ] Push master to origin 68- [x] Push master to origin
69- [ ] Delete hardening worktree 69- [x] Delete hardening worktree
70- [ ] Delete `feature/relay-hardening` branch 70- [x] Delete `feature/relay-hardening` branch
71 71
72--- 72---
73 73