Merge remote-tracking branch 'origin/main' into item-470
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
`Bar = 0.1`
|
||||
|
||||
`Next ID = 472`
|
||||
`Next ID = 473`
|
||||
|
||||
## Items
|
||||
|
||||
@@ -14,7 +14,8 @@
|
||||
|---|---|---|---|---|---|---|---|---|---|---|---|
|
||||
| 470 | 0.15.0 | | | **Start an epic's runnable issues in order of score alone, scoring each open issue that holds no scores, the ones people filed included, so Jira's backlog order no longer decides what starts.** | 3 | 2 | 2 | 5 | 5 | 1.2 by 4, 1.6 by 3 | 1.5 |
|
||||
| 454 | 0.15.0 | | | **Start a do-epic chunk's issue as the team's board expects, by settings: assigned to the account do-epic works as, moved by a start transition and added to a board's active sprint.** | 3 | 2 | 2 | 5 | 4 | 1.6 by 4 | 1.1 |
|
||||
| 467 | 0.15.0 | 454, 470 | question | **Cut 0.15.0 as soon as items 449, 450, 453, 454, 468 and 470 have merged, before its release review, and run that review in 0.15.1.** | 1 | 1 | 1 | 1 | 1 | | 0.0 |
|
||||
| 472 | 0.15.0 | 454 | owner | **Let a project's config name a working branch per epic, such as `TW-12345`, that chunks branch off, merge into and keep level with `main`, so a person merges the finished epic into `main` in one pull request.** | 4 | 2 | 3 | 7 | 7 | 1.5 by 6, 1.6 by 7 | 1.1 |
|
||||
| 467 | 0.15.0 | 454, 470, 472 | question | **Cut 0.15.0 as soon as items 449, 450, 453, 454, 468, 470 and 472 have merged, before its release review, and run that review in 0.15.1.** | 1 | 1 | 1 | 1 | 1 | | 0.0 |
|
||||
| 469 | 0.15.1 | | | **Move a do-epic parent issue whose sub-tasks a person filed to Release Ready once every sub-task has landed, and to Done once every sub-task is done, by transitions its config names.** | 3 | 2 | 2 | 5 | 4 | 1.2 by 4, 1.5 by 4, 1.6 by 3 | 3.1 |
|
||||
| 446 | 0.16.0 | | question | **Kill the process a stuck check names where its verdict is `stuck`, once the human says the recorded verdicts match what they would have done.** | 2 | 2 | 3 | 5 | 3 | 1.5 by 3 | 1.0 |
|
||||
| 462 | 0.16.0 | | | **Run under `mutate-changes` the tests that today fail in mutmut's copy of the tree, so a mutant of a line only they cover is killed.** | 2 | 1 | 2 | 3 | 3 | code health by 3 | 4.7 |
|
||||
@@ -121,7 +122,37 @@ Touches:
|
||||
- `bin/do_epic/backend/test_jira.py`
|
||||
- `README.md`: `### Set up a project` (small)
|
||||
|
||||
### 467. Cut 0.15.0 as soon as items 449, 450, 453, 454, 468 and 470 have merged, before its release review, and run that review in 0.15.1.
|
||||
### 472. Let a project's config name a working branch per epic, such as `TW-12345`, that chunks branch off, merge into and keep level with `main`, so a person merges the finished epic into `main` in one pull request.
|
||||
|
||||
Today every chunk branches off the default branch and its pull request merges into it. A team whose rules keep merges into `main` with a person, such as Timewave's, then sets `merge = "human"`, and the loop stops at every chunk until someone merges. lilleman asked on 2026-11-20 for a working branch per epic instead: agents merge each chunk into a branch named as the epic, such as `TW-12345`, and when the whole epic is done and reviewed, a person merges that branch into `main` in one pull request.
|
||||
|
||||
- **A setting in the project's config turns it on,** such as `merge-branch = "{epic}"`, filled with the epic's key. Left out, chunks branch off and merge into the default branch, as today. `project-config --help` and README's `### Set up a project` describe it.
|
||||
- **The first chunk of an epic creates the branch** off `origin/main` and pushes it. `chunk-preflight` branches each chunk's worktree off `origin/<epic branch>`, and `chunk-pr open`, `ready`, `merge` and `clean` take that branch as the base, not the default branch.
|
||||
- **`chunk-pr merge` merges into the epic branch without waiting for a person,** even under `merge = "human"`, which then governs only the epic branch's own pull request into `main`. lilleman's call: the team's rule against merging a pull request without a person's go-ahead covers `main` and protected branches, not an epic branch. Record this as a decision.
|
||||
- **Keep the epic branch level with `main`:** before each chunk starts, and before the final pull request opens, merge `origin/main` into the epic branch with a merge commit, never a rebase, since several chunks share it. A conflict stops the loop and asks the human; the loop never resolves one itself.
|
||||
- **CI and CodeRabbit run as on `main`:** the gate runs on every pushed branch in Timewave's repos already. CodeRabbit skips a pull request whose base isn't `main`, so `chunk-pr` comments `@coderabbitai review` after each push to such a pull request, and the chunk waits for that review as for any outside reviewer.
|
||||
- **Move each issue as the CI automations would:** `jira-code-review.yml` and `jira-release-ready.yml` fire only for pull requests into `main`, so on an epic branch do-epic makes those moves itself, by transitions its config names, such as Code Review when the pull request opens and Release Ready when it merges into the epic branch. Without them, do-epic would never see an issue land, and every issue it blocks would wait. Build on item 454's transitions.
|
||||
- **Test against the same epic branch in the other repos:** where a chunk's tests run other services, such as Timewave's integration harness, each sibling repo runs at its branch of the same name where one exists, and at `main` otherwise. The harness lives in the team's repo `docs-and-tools` (`docker/scripts/run_harness.py`), which today clones and runs every sibling at `main`; it needs a branch option there, through a Jira ticket of the team's, before the chunk can pass the epic branch to it. Until then, the chunk's summary says the siblings ran at `main`.
|
||||
- **When the epic's last issue is done,** run its release review on the epic branch, then open the pull request into `main` and leave it to a person.
|
||||
|
||||
Touches:
|
||||
|
||||
- `bin/chunk_pr/main.py`: `default_branch`, `opened`, `synced`, `levelled`, `marked_ready`, `merged`, `cleaned`
|
||||
- `bin/chunk_preflight/main.py`: `preflight`, `item_worktree`
|
||||
- `bin/git_cli/git_repo.py`: `default_branch` (small)
|
||||
- `bin/project_config/settings.py`
|
||||
- `bin/project_config/main.py`: `main` (small)
|
||||
- `bin/do_epic/config.py`: `DoEpicConfig`, `load`
|
||||
- `bin/do_epic/chunk_prompt.py`: `shipping`, `task`
|
||||
- `bin/do_epic/gates.py`: `gate`
|
||||
- `bin/do_epic/main.py`: `planned_and_started` (small)
|
||||
- `bin/do_epic/backend/jira.py`: `JiraEpic`
|
||||
- `bin/do_epic/test_do_epic.py`
|
||||
- `bin/chunk_pr/test_main.py`
|
||||
- `docs/decisions.md`
|
||||
- `README.md`: `### Set up a project` (small)
|
||||
|
||||
### 467. Cut 0.15.0 as soon as items 449, 450, 453, 454, 468, 470 and 472 have merged, before its release review, and run that review in 0.15.1.
|
||||
|
||||
lilleman's call on 2026-11-20: they need what 0.15.0 holds to work, so 0.15.0 is cut without a release review. This item holds the loop back from starting 0.15.0's release review once its last item merges: it waits as a question, so the human, or the session that cuts, drops it at the cut. Item 469 moved to 0.15.1 by lilleman's call the same day, so 0.15.0 ships sooner. After the cut, 0.15.1's release review, which runs once 469 has merged, covers what 0.15.0 shipped too, and its follow-ups land in 0.15.1.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user