chore(merge): update starbase (2026-10-20)
Metadata
Current evaluation
Merged routine Starbase sync updating dependencies, tooling configs, and resolving merge conflicts. All CI checks and validation passed.
Resolution: closed resolved
Reason: The pull request was merged, applying the Starbase sync updates to the craft-store repository. All CI checks passed and the changes were approved by reviewers.
Evaluated by: mr-cal-bot
No scores available.
Issue body
CRAFT-2664
Rebuild of the Starbase sync, rebased onto the current heads of both `origin/main` (`af870cf`) and `starbase/main` (`d7affc9`). Recreated under the `LoweRAM` account from a fork to supersede #440.
## Overview of changes
Pulled from `starbase/main` (8 commits since previous sync):
- `d7affc9`: `docs: instruct agents to never run 'make -C docs' (#636)`
- `3c895c5`: `build(deps): update github actions (#637)`
- `bdab610`: `build(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.17.0 (#621)`
- `1104bc6`: `style: drop mypy, pyright (#624)` — drops `[tool.mypy]`, `[tool.pyright]`, `mypy` dependency group, and `lint-mypy`/`lint-pyright`/`install-pyright` from `common.mk`
- `cb4cb54`: `build(deps): lock file maintenance (#622)`
- `26946d1`: `build(deps): update github actions (#618)`
- `3a6537c`: `build(deps): update dependency mypy to ~=2.4.0 (#619)`
- `e71c218`: `build(deps): update astral-sh/setup-uv action to v10 (#620)`
Pulled from `origin/main`: all commits since previous revision, including merged prep PRs #444 (`fix: resolve ruff and ty lint findings`) and #445 (`docs: resolve Vale spellcheck errors from vale 3.22`).
## Conflict resolution
Resolved per `references/file_ownership.md`:
- **Kept child (`--ours`):** `.github/workflows/qa.yaml`, `CONTRIBUTING.md`, `docs/explanation/documentation.rst`, and `uv.lock` (regenerated).
- **Took from `starbase/main`:** `.github/workflows/check-renovate.yaml`, `.github/workflows/release-publish.yaml`, `common.mk`, `.editorconfig`, `.github/actionlint.yaml`, `.github/workflows/copilot-setup-steps.yaml`, `.github/zizmor.yaml`.
- **`.github/workflows/tics.yaml`:** kept reusable workflow call from Starbase with `with.project: "craft-store"` preserved.
- **`.pre-commit-config.yaml`:** kept child repo's newer hook pin `v0.17.1` for `ruff-pre-commit` over Starbase's `v0.17.0` (never downgrade a hook rule).
- **`Makefile` (mixed ownership):** kept child `PROJECT=craft_store` and prettier exclusions, took Starbase's `format-tombi`/`lint-tombi`, dropped application `pack-snap`.
- **`docs/conf.py`:** kept child project values, took Starbase scaffold updates.
- **`pyproject.toml`:** kept child `[project]`, `[dependency-groups]`, `[build-system]`, `[tool.setuptools]`, `[tool.setuptools_scm]`; merged constraint dependencies; kept Starbase `tool.ruff` block while preserving child `src`, `extend-exclude`, and child `ignore` entries (`FBT001`, `FBT002`, `FIX002`, `SLF001`).
## Library-repo deletions (rule 1b)
- `AGENTS.app.md`
- `AGENTS.lib.md`
- `.github/README.md`
- `docs/release-notes/`
- `starcraft/__init__.py` and `tests/unit/starbase/test_init.py`
## Validation
| Check | Result |
|---|---|
| `make format` | **PASS** |
| `make lint` | **PASS** (ruff, ty, codespell, prettier, tombi, docs-lint, actionlint clean) |
| `make docs` | **PASS** (HTML, Vale, spelling, linkcheck clean) |
| `make test-fast` | **PASS** (266 passed, 34 deselected) |
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged routine Starbase sync updating dependencies, tooling configs, and resolving merge conflicts. All CI checks and validation passed. |
Update history
| Date | Change |
|---|---|
| merged | |
| updated | |
| updated | |
| updated | |
| created |
Related work
-
Superseded By:
craft-store#440
(confidence 100%)
This PR was explicitly created to supersede the original sync attempt in #440.
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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. |