Phase 1 of issue #16. Split out so it fits inside a single short work window: issue #16 has been attempted three times and every attempt was killed by infrastructure before it produced a single pushed commit. This sub-issue is scoped so that its entire output is a pushed branch, which is the only artifact that survives a kill.
This is not a scaffold-writing task. The STRTA scaffold already exists complete on next (landed 2026-07-07). Do not re-implement it.
Base
Branch from main (64c30e9), and merge next (ac3031a) into it. main is the base because the 1.1.0 release lands on main. Do NOT branch from next and do NOT rebase or cherry-pick — next is long-lived and its history is kept. Use a real merge commit.
The two branches diverged from common ancestor 6cb690b in both directions:
main +2 — golangci-lint v2.12.2, canonical .golangci.yml, and the source fixes the v1 to v2 jump required
Definition of done
A branch merge/next-to-main-1.1.0 cut from main with next merged into it, pushed to origin.
All merge conflicts resolved. TODO.md is modified on both sides and will definitely conflict. Check README.md and the Dockerfile too.
.golangci.yml is not modified — it is standardized and owner-only.
The tree compiles: go build ./... and go vet ./... pass.
A comment on this issue recording exactly which files conflicted and how each was resolved.
Explicitly OUT of scope — leave for phase 2
Reconciling script/lint / script/fmt-check / script/check with golangci-lint v2.12.2 (next's scripts were written against the old v1.64.8 pin).
Getting docker build . green.
Opening the PR.
Creating any git tag. Tags are the owner's to push.
A fully green tree is NOT required here. Resolve the conflicts, prove it compiles, push, stop. Phase 2 takes it from there.
Out of scope, do not touch: issues #19, #20, #22, #23.
Phase 1 of [issue #16](https://git.eeqj.de/sneak/simplelog/issues/16). Split out so it fits inside a single short work window: issue #16 has been attempted three times and every attempt was killed by infrastructure before it produced a single pushed commit. This sub-issue is scoped so that its entire output is a **pushed branch**, which is the only artifact that survives a kill.
**This is not a scaffold-writing task.** The STRTA scaffold already exists complete on `next` (landed 2026-07-07). Do not re-implement it.
## Base
Branch from **`main`** (`64c30e9`), and merge **`next`** (`ac3031a`) into it. `main` is the base because the 1.1.0 release lands on `main`. Do NOT branch from `next` and do NOT rebase or cherry-pick — `next` is long-lived and its history is kept. Use a real merge commit.
The two branches diverged from common ancestor `6cb690b` in both directions:
- `next` +2 — STRTA scaffold (`script/`, Makefile shims, `.gitea/workflows/check.yml`), vendored `REPO_POLICIES.md`
- `main` +2 — golangci-lint v2.12.2, canonical `.golangci.yml`, and the source fixes the v1 to v2 jump required
## Definition of done
1. A branch `merge/next-to-main-1.1.0` cut from `main` with `next` merged into it, **pushed to origin**.
2. All merge conflicts resolved. `TODO.md` is modified on both sides and will definitely conflict. Check `README.md` and the `Dockerfile` too.
3. `.golangci.yml` is **not modified** — it is standardized and owner-only.
4. The tree compiles: `go build ./...` and `go vet ./...` pass.
5. A comment on this issue recording exactly which files conflicted and how each was resolved.
## Explicitly OUT of scope — leave for phase 2
- Reconciling `script/lint` / `script/fmt-check` / `script/check` with golangci-lint v2.12.2 (`next`'s scripts were written against the old v1.64.8 pin).
- Getting `docker build .` green.
- Opening the PR.
- Creating any git tag. Tags are the owner's to push.
A fully green tree is NOT required here. Resolve the conflicts, prove it compiles, push, stop. Phase 2 takes it from there.
Out of scope, do not touch: issues #19, #20, #22, #23.
clawbot
added the bot label 2026-09-04 00:05:06 +02:00
clawbot
self-assigned this 2026-09-04 00:05:06 +02:00
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Phase 1 of issue #16. Split out so it fits inside a single short work window: issue #16 has been attempted three times and every attempt was killed by infrastructure before it produced a single pushed commit. This sub-issue is scoped so that its entire output is a pushed branch, which is the only artifact that survives a kill.
This is not a scaffold-writing task. The STRTA scaffold already exists complete on
next(landed 2026-07-07). Do not re-implement it.Base
Branch from
main(64c30e9), and mergenext(ac3031a) into it.mainis the base because the 1.1.0 release lands onmain. Do NOT branch fromnextand do NOT rebase or cherry-pick —nextis long-lived and its history is kept. Use a real merge commit.The two branches diverged from common ancestor
6cb690bin both directions:next+2 — STRTA scaffold (script/, Makefile shims,.gitea/workflows/check.yml), vendoredREPO_POLICIES.mdmain+2 — golangci-lint v2.12.2, canonical.golangci.yml, and the source fixes the v1 to v2 jump requiredDefinition of done
merge/next-to-main-1.1.0cut frommainwithnextmerged into it, pushed to origin.TODO.mdis modified on both sides and will definitely conflict. CheckREADME.mdand theDockerfiletoo..golangci.ymlis not modified — it is standardized and owner-only.go build ./...andgo vet ./...pass.Explicitly OUT of scope — leave for phase 2
script/lint/script/fmt-check/script/checkwith golangci-lint v2.12.2 (next's scripts were written against the old v1.64.8 pin).docker build .green.A fully green tree is NOT required here. Resolve the conflicts, prove it compiles, push, stop. Phase 2 takes it from there.
Out of scope, do not touch: issues #19, #20, #22, #23.
clawbot referenced this issue2026-09-04 00:06:38 +02:00
clawbot referenced this issue2026-09-04 00:06:38 +02:00
clawbot referenced this issue2026-09-05 03:41:38 +02:00