Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e030486ce6 | ||
|
|
d89ae23195 | ||
|
|
f206ddfde5 | ||
|
|
bf29518a15 | ||
|
|
169dbe2f38 |
@@ -48,17 +48,37 @@ the [runbook index](#runbook-index). The full swap history lives in
|
||||
pages (`serverAppConfigs-docs/log.md` carries the wave plan and results)
|
||||
- `tests/` — bats suite + Playwright e2e
|
||||
|
||||
## Git Workflow
|
||||
## Git Workflow — trunk-based (fleet law, aligned 2026-10-18)
|
||||
|
||||
All edits flow through git. Never edit files on a remote machine directly.
|
||||
|
||||
1. **Source** the live config from the target machine
|
||||
2. **Commit** the fetched version here (redact secrets into `.env`)
|
||||
3. **Edit** locally
|
||||
4. **Test** — `./tests/run.sh` must pass
|
||||
5. **Commit and push** — origin is Gitea on Dankclaw
|
||||
6. **Pull** on the target (`deploy.sh` does this)
|
||||
7. **Deploy** — `scripts/deploy.sh` plans and dispatches only changed services
|
||||
`main` is the only long-lived branch: no `develop`, no release branches, no
|
||||
back-merges. Frank is the only dev; this repo and `dank/command-center` follow
|
||||
the same regime.
|
||||
|
||||
1. **Branch fresh** — `git fetch`, then branch off the current `origin/main`
|
||||
(`<type>/<slug>`, type ∈ feat|fix|docs|chore). If main moves under you,
|
||||
merge it into your branch — never rebase.
|
||||
2. **Source** the live config from the target machine
|
||||
3. **Commit** the fetched version here (redact secrets into `.env`)
|
||||
4. **Edit** locally
|
||||
5. **Test** — `./tests/run.sh` must pass
|
||||
6. **Push the branch and open a PR against `main`** — origin is Gitea on
|
||||
Dankclaw. Merge with `--no-ff`; **never merge a PR without an explicit,
|
||||
current OK from Frank.** **The moment the PR is open, open it in Frank's
|
||||
browser** (`xdg-open <PR-URL>` — a Firefox tab on the workstation); never
|
||||
make him hunt for it in Gitea. Releases: tag `vX.Y.Z` straight on `main`.
|
||||
7. **Pull** on the target (`deploy.sh` does this)
|
||||
8. **Deploy** — `scripts/deploy.sh` plans and dispatches only changed services
|
||||
|
||||
**Attribution footer (issues and PRs)** — every issue or PR body you open MUST end with:
|
||||
|
||||
```
|
||||
---
|
||||
cwd: <working directory> · session: <omp session id>
|
||||
```
|
||||
|
||||
Session id from `/status`; `cwd` is that session's own working directory — not the build checkout, when they differ (note the build worktree in the body instead). Machine-made artifacts stay attributable to the box and session that spawned them.
|
||||
|
||||
## Deployment
|
||||
|
||||
|
||||
Reference in new issue
Block a user