chore(merge): update starbase (2026-10-16)
Metadata
Current evaluation
Merged PR #1398 syncing starbase/main into main, updating build system, workflows, docs tooling, and dependencies, with conflict resolutions and RTD build fixes.
Resolution: closed resolved
Reason: The PR was merged into main, syncing starbase updates and resolving merge conflicts. It includes build system, workflow, and documentation tooling updates, along with fixes for RTD build failures.
Evaluated by: mr-cal-bot
No scores available.
Issue body
🤖 This message was generated by kimi-k3
## Summary
Merges `starbase/main` (bdab610) into main, syncing Starbase-managed updates:
- **Build system**: new lint targets (shfmt, tombi, actionlint), `lint-code` aggregate target, coverage config relocated, ruff config updates (2-space → 4-space reformat plus new test per-file-ignores PLR0917/FBT001/FBT002), pre-commit ruff bumped to v0.17.0 with the new `shfmt` hook.
- **Workflows**: new `.github/actionlint.yaml`, `.github/workflows/copilot-setup-steps.yaml`, `.github/zizmor.yaml`; explicit permissions on policy/release-publish/tics; TICS now takes an explicit `TICSAUTHTOKEN` secret.
- **Docs tooling**: Sphinx Stack updates (sphinx-sitemap 2.9, `slug` config, sphinx-llm, rerediraffe), `docs/_dev` scripts, rewritten docs README describing the new update process, new `docs/explanation/documentation.rst` page (adapted to Rockcraft naming and added to the explanation toctree).
- **Dependencies**: `docs-sphinx-stack` group is now fully Starbase-owned (sphinx-tabs, sphinx-ubuntu-images, sphinx-youtube-links, svg2pdfconverter disabled); `uv.lock` regenerated.
- **AGENTS scaffold**: `AGENTS.md`/`AGENTS.lib.md`/`AGENTS.app.md` templates were taken as reference and deleted (rockcraft has no repo-level AGENTS.md; the scaffold text describes the starcraft scaffold package, not rockcraft).
## Conflict resolution highlights
- Kept child-owned files: `.github/CODEOWNERS`, `.github/workflows/qa.yaml`, `docs/{explanation,how-to,index,reference,release-notes}/index.rst`, `docs/.custom_wordlist.txt` (child superset; deliberately did **not** add `Starbase`/`Starcraft` per policy), and `tests/`.
- Took starbase-owned files verbatim: `common.mk`, `policy.yaml`, `release-publish.yaml`, `check-renovate.yaml`, `.pre-commit-config.yaml` (all pins newer — verified no hook downgrades), `docs/{README.md,Makefile,.gitignore,requirements.txt}`, `docs/_dev/*`, `osv-scanner.toml`.
- `tics.yaml`: starbase structure with `with.project` set to `"rockcraft"`.
- `Makefile`: starbase structure + child-owned `PROJECT=rockcraft`, uncommented VERSION_CODENAME dev-groups block (rockcraft has distro-specific dev groups), `pack-snap`, schema targets, extra APT packages, `install-ajv-cli`.
- `docs/conf.py`: starbase scaffold with child-owned values (project, URLs, license, slug, llms_txt_description, copyright start 2022, linkcheck/exclude additions, extensions, intersphinx mappings, CLI-docs automation, common-docs symlinks, notfound config).
- `pyproject.toml`: child-owned `[project]`, `[dependency-groups]` (except starbase-owned `docs-sphinx-stack`), `[build-system]`, `[tool.uv]` (constraint superset kept), `[tool.ty.src]`; starbase-owned `[tool.setuptools_scm]` (write_to adapted), `[tool.ruff]` (with rockcraft src/extend-exclude and PLC0415 ignore), `[tool.coverage]`, `[tool.isort]`, `[tool.codespell]`. Stray orphaned mypy settings under `[tool.coverage.report]` were dropped (mypy was replaced by ty in 5d9356c; starbase likewise dropped mypy/pyright in 1104bc6).
- `CONTRIBUTING.md`: starbase template with Rockcraft substitutions (GPL-3.0, Matrix channel, test-suite description, release-notes link).
- `.prettierignore`: starbase baseline + rockcraft-specific entries kept (`schema/rockcraft.json`, `tools/external`) marked as repository-specific additions; dropped obsolete `docs/sphinx-docs-starter-pack` entry (path no longer exists).
- Kept deleted: `.github/README.md` (child-side deletion), `docs/tutorials/index.rst` (a symlink to ../how-to/index.rst here), `tests/unit/starbase/test_init.py` (scaffold-only test).
## Pending preparation PRs
These pre-existing/unrelated fixes were split out so the merge diff stays reviewable; this PR should not be marked ready until they merge:
- #1396 — style: fix findings from ruff 0.17, shfmt, and tombi (test fixtures + tools)
- #1397 — style(ci): fix actionlint findings in schema and snap workflows
Once those merge, this branch will be rebased so their changes drop out of this diff.
## Validation
- `make docs` ✅ (builds clean, all redirects report `(good)`)
- `make docs-lint` ✅ (sphinx-lint, vale spelling/woke — 0 errors in 156 files)
- `make test-fast` ✅ (652 passed, 1 skipped)
- `make lint`: ruff/shfmt/actionlint failures correspond exactly to the two prep PRs above plus failures already present on `main` (ty diagnostics; ruff findings under the unpinned snap ruff 0.17).
- Follow-up commits on this branch: docs README vale inline-ignore for the legitimate `Starbase` proper-noun references (template file that must reference the upstream repo), and the mechanical tombi reformat of `pyproject.toml` (parsed TOML verified identical modulo ordering).
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged PR #1398 syncing starbase/main into main, updating build system, workflows, docs tooling, and dependencies, with conflict resolutions and RTD build fixes. | |
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged starbase/main sync into main, updating build system, workflows, docs, and dependencies. Resolved conflicts, fixed RTD failures, and squashed commits. | |
| qwen/qwen3.6-35b-a3b |
Impact:
35
Quick Win:
5
Complexity:
55
Confidence:
70
Actionability:
30
|
keep open | Syncs starbase/main updates into rockcraft: build system, workflows, docs tooling, and dependencies. Under review with 35 unresolved comments; rebased and squashed after prep PRs merged. |
Update history
| Date | Change |
|---|---|
| updated | |
| merged | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| updated | |
| created |
Related work
-
Likely Fixed By:
canonical/rockcraft#1396
(confidence 95%)
Prep PR fixing ruff, shfmt, and tombi findings merged before this PR.
-
Likely Fixed By:
canonical/rockcraft#1397
(confidence 95%)
Prep PR fixing actionlint findings in schema and snap workflows merged before this PR.
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. | |
| #507 chore(merge): update starbase (2026-10-20) | craft-cli | merged | 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. | |
| #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. | |
| #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. | |
| #1728 chore(merge): update starbase (2026-10-01) | craft-parts | merged | Merged #1728 into main as d2be519e, syncing starbase/main's build, CI, docs tooling, Ruff 0.16, Sphinx Stack, and AGENTS.md updates. | |
| #433 chore(merge): update starbase (2026-10-08) | craft-store | closed | Merged routine starbase dependency and tooling updates with conflict resolutions applied to align with starbase/main. | |
| #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. | |
| #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. | |
| #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. |