store: Major Domo v2: next-release branch accumulates changes before main merge

This commit is contained in:
Cal Corum 2026-02-20 10:50:39 -06:00
parent 65d437a499
commit 21fade4617

View File

@ -0,0 +1,39 @@
---
id: 455da58f-7acf-4158-b5a4-7873fd32581e
type: decision
title: "Major Domo v2: next-release branch accumulates changes before main merge"
tags: [major-domo, git, workflow, decision, ci-cd, release]
importance: 0.65
confidence: 0.8
created: "2026-02-20T16:50:39.664619+00:00"
updated: "2026-02-20T16:50:39.664619+00:00"
---
# next-release Branch Pattern for Major Domo v2
## Decision
Major Domo v2 (`discord-app-v2`) uses a `next-release` branch to accumulate multiple changes before merging to `main` and triggering a CalVer release.
## Branch flow
```
feature/name → next-release → main (triggers CI/CD + Docker image build)
fix/name → next-release
```
## Current state (as of 2026-02-20)
`next-release` contains:
- Local deploy script
- Obsolete test stub removal
- 7 security fixes (commit `f4be20a`)
## Rationale
- Avoids triggering a production release for every small fix or feature
- Groups related work into a meaningful release unit
- Gives time to add production environment changes (e.g. new env vars) before deploying
## Remote tracking
`next-release` tracks `origin/next-release` on Gitea (git.manticorum.com).
## Related
- CalVer versioning: `YYYY.MM.BUILD` generated automatically on merge to `main` via Gitea Actions
- Docker image: `manticorum67/major-domo-discordapp` (no dash between discord and app)