chore(merge): update starbase (2026-10-20)
Metadata
Current evaluation
Merged starbase/main sync updating CI workflows, build tooling, and docs scaffolding. Resolved 27 file conflicts, incorporated prep PRs #505 and #506, and squashed follow-up fixes into a single merge commit.
Resolution: closed resolved
Reason: The PR was merged into main, syncing starbase build tooling, CI workflows, and docs scaffolding. It incorporated preparation PRs #505 and #506, resolved 27 file conflicts, and squashed follow-up fixes into a single merge commit.
Evaluated by: mr-cal-bot
No scores available.
Issue body
🤖 This message was generated by kimi-k3.
## Summary
Merges `starbase/main` (bdab610) into craft-cli, syncing Starbase-managed build tooling, CI workflows, and docs scaffolding.
### Starbase changes pulled in
- CI workflows: new `actionlint`, `zizmor`, and `copilot-setup-steps` configs; updated `check-renovate`, `policy`, `release-publish`, and TICS workflows
- Build tooling: `common.mk` updates (new `lint-code`, `lint-uv-lockfile`, `lint-actions`, `format-shfmt`/`lint-shfmt`, `format-tombi`/`lint-tombi` targets); ruff-pre-commit bumped to v0.17.0
- Docs tooling: Sphinx Stack updates (sitemap, llms.txt, sphinx-rerediraffe 0.3.0, meta descriptions on Diátaxis landing pages)
- `osv-scanner` configuration
### Conflict resolution
Per the file-ownership map (27 conflicts resolved): child-owned files kept (`CODEOWNERS`, `qa.yaml`, `uv.lock`, `README.md`, `CONTRIBUTING.md`, `tests/`, docs pages with Starcraft→Craft CLI substitutions); starbase-owned files taken verbatim (`common.mk`, workflow files, `.pre-commit-config.yaml` with the newer ruff pin, `docs-sphinx-stack` group); mixed-ownership files merged per section (`pyproject.toml`, `Makefile`, `docs/conf.py`, wordlist). Deleted per library-repo rules: `docs/release-notes/`, `.github/README.md`, `tests/unit/starbase/`, AGENTS templates, and the stale `docs/.sphinx/` leftover.
### Preparation PRs (must merge before this comes out of draft)
- #505 — test: make completion test robust to shfmt formatting (the merge's `lint-shfmt` target fails on `tests/integration/test_completion/expected_script.sh` until this lands)
- #506 — style: format pyproject.toml with tombi (the merge's `lint-tombi` target fails until this lands)
Once both merge, this branch will be rebased onto `main` so those changes drop out of this diff.
### Validation
- `make docs` — passes (all redirects report `(good)`)
- `lint-ruff`, `lint-ty`, `lint-codespell`, `lint-prettier`, `lint-shellcheck`, `lint-twine`, `lint-uv-lockfile`, `lint-actions` — pass
- `lint-shfmt` — fails on `tests/integration/test_completion/expected_script.sh`; fixed by #505
- `lint-tombi` — fails on `pyproject.toml`; fixed by #506
- `lint-docs` — fails because `sphinx-lint` scans the local `docs/.venv`; upstream issue filed: canonical/starbase#635 (the merge adds `docs/.venv/` to `.gitignore`; the sphinx-lint ignore needs a starbase-side fix)
- `make test-fast` — all pass except `test_completion_output`, fixed by #505
### Follow-up commits
- `fix: remove stale noqa directives and ignore docs/.venv` — RUF100 cleanups required by the merge's ruff rule additions, plus `docs/.venv` gitignore entry
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged starbase/main sync updating CI workflows, build tooling, and docs scaffolding. Resolved 27 file conflicts, incorporated prep PRs #505 and #506, and squashed follow-up fixes into a single merge commit. |
Update history
| Date | Change |
|---|---|
| merged | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| created |
Related work
-
Related To:
craft-cli#505
(confidence 95%)
Preparation PR to make completion test robust to shfmt formatting, required before this merge.
-
Related To:
craft-cli#506
(confidence 95%)
Preparation PR to format pyproject.toml with tombi, required before this merge.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #493 chore(merge): update starbase (2026-10-08) | craft-cli | closed | Merged routine starbase/main sync updating build system, CI workflows, documentation tooling, and dependencies, with resolved merge conflicts. | |
| #1398 chore(merge): update starbase (2026-10-16) | rockcraft | merged | Merged PR #1398 syncing starbase/main into main, updating build system, workflows, docs tooling, and dependencies, with conflict resolutions and RTD build fixes. | |
| #449 chore(merge): update starbase (2026-09-28) | imagecraft | merged | Merged in #449 via commit 545f51a, rebuilding the Starbase sync on current main and starbase/main and folding dependency, lint, docs, and CI adjustments into one merge. | |
| #219 chore(merge): update starbase (2026-10-13) | craft-grammar | closed | Merged routine starbase sync updating CI workflows, lint configs, and docs tooling to align with starbase/main. | |
| #1189 chore(merge): update starbase (2026-10-05) | craft-application | merged | Merged automated Starbase sync into main, updating CI workflows, repo configs, and osv-scanner ignores across 13 files. | |
| #213 chore(merge): update starbase (2026-10-19) | debcraft | merged | Merged starbase/main updates into debcraft/main, syncing docs tooling, workflows, pre-commit hooks, and templates. Resolved conflicts and passed all CI checks. | |
| #449 chore(merge): update starbase (2026-10-20) | craft-store | merged | Merged routine Starbase sync updating dependencies, tooling configs, and resolving merge conflicts. All CI checks and validation passed. | |
| #225 chore(merge): update starbase (2026-10-16) | craft-grammar | merged | Merged PR #225 syncing starbase/main into craft-grammar, updating CI, linting, and docs tooling, and resolving merge conflicts. | |
| #270 chore(merge): update starbase (2026-09-28) | craft-platforms | closed | Merged into main as commit 4afcee7. First-ever Starbase sync of build/CI/docs conventions (41 files, +2012/-248), rebuilt several times to fold in preparation PRs #271, #272, #275, #276, #277. All CI green, including RTD. | |
| #1019 chore(merge): update starbase (2026-10-09) | craft-providers | closed | Merged into main, updating starbase to a310931. Includes build tooling, CI workflow, and dependency updates. Conflict resolutions applied and validation passed. |