chore(merge): update starbase (2026-10-19)
Metadata
Current evaluation
Merged #1028 updates craft-providers to starbase/main@3c895c5, incorporating dependency bumps, CI workflow updates, and build tooling changes while preserving child repository configurations.
Resolution: closed resolved
Reason: The pull request was merged into main, updating the project to the latest starbase/main commit (3c895c5). It successfully resolved merge conflicts, updated dependencies, and passed local validation checks.
Evaluated by: mr-cal-bot
No scores available.
Issue body
🤖 [BEEP BOOP, A BOT WROTE THIS COMMENT - google-gemini-3-8-flash, opencode]
Merge `starbase/main` (`3c895c5`, includes starbase#621/#622/#624/#637) into `main`.
Replaces #1019, which is closed because its head branch lives in the
canonical repo and this account cannot refresh it; the identical rebuilt
merge commit is pushed from the fork instead.
## Starbase changes pulled in
- Dropped mypy and pyright from tooling (starbase#624): no `[tool.mypy]`, no `lint-mypy`/`lint-pyright` targets, lock re-resolved.
- Dependency-lock maintenance (starbase#622, starbase#637) and pre-commit ruff bump.
- CI workflow updates: release-publish, check-renovate, copilot-setup-steps, zizmor, policy.
- Build tooling: uv-based Makefile targets, pre-commit, tombi; docs tooling (Sphinx stack alignment, wordlist, prettier).
## Conflict resolution
- Kept child versions of `.github/CODEOWNERS`, `AGENTS.md` (from #1023), `.github/workflows/qa.yaml`, and `CONTRIBUTING.md`.
- Took full `common.mk`, `Makefile` structure, `.github/workflows/check-renovate.yaml`, `.github/workflows/release-publish.yaml`, and `.prettierignore` from starbase (source-of-truth files).
- Retained child repository's newer `astral-sh/ruff-pre-commit` pin `v0.17.1` in `.pre-commit-config.yaml` per file ownership rules.
- `Makefile`: starbase structure with child-owned values (CI shell, LXD setup, multipass install, TICS setup, test-coverage marker).
- `pyproject.toml`/`docs/conf.py`: starbase structure with child-owned values; starbase's mypy/pyright removal applied; merged child pytest markers; kept child ruff per-file-ignores; `uv.lock` re-resolved.
- `.github/workflows/tics.yaml`: starbase workflow with `with.project: craft-providers`.
- Kept child deletions of `.github/README.md`, `AGENTS.app.md`, `AGENTS.lib.md`, `docs/release-notes/index.rst`, `docs/explanation/documentation.rst`, and `tests/unit/starbase/test_init.py` (imports the scaffold `starcraft` module).
## Validation (local)
- `make docs`, `make test-fast` (1682 passed): pass.
- `make lint`: all checks pass cleanly (`ruff`, `ty`, `codespell`, `prettier`, `tombi`, `docs`, `twine`, `uv-lockfile`, `actionlint`).
- Starbase-owned files verified against `starbase/main`.
## Preparation PRs
- #1020 fix(types): use Generator return types for contextmanagers — merged
- #1022 style: reformat shell scripts with shfmt — merged
- #1023 docs: add AGENTS.md for craft-providers — merged
- #1024 build(deps): raise urllib3 to 2.8.0 — merged
- #1027 style: alias datetime import to dt for ruff import conventions — merged
- #1029 build(deps): update pre-commit hook astral-sh/ruff-pre-commit to v0.17.1 — merged
---
Provenance: `starbase/main@3c895c5`.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged #1028 updates craft-providers to starbase/main@3c895c5, incorporating dependency bumps, CI workflow updates, and build tooling changes while preserving child repository configurations. |
Update history
| Date | Change |
|---|---|
| merged | |
| updated | |
| updated | |
| updated | |
| created |
Related work
-
Superseded By:
canonical/craft-providers#1019
(confidence 100%)
This PR replaces #1019, which was closed because its head branch lived in the canonical repo and could not be refreshed.
-
Related To:
canonical/craft-providers#1029
(confidence 100%)
Preparation PR merged prior to this update, bumping the ruff-pre-commit hook to v0.17.1.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #377 chore(merge): update starbase | craft-store | merged | Merged Starbase updates into craft-store in commit 3c9f44f, bringing in changes accumulated since #337. | |
| #387 chore(merge): update starbase (2026-06-18) | craft-store | merged | Merged PR #387 in commit 5c83549, updating Starbase docs/build tooling while preserving craft-store-specific CI and CODEOWNERS 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. | |
| #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. | |
| #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. | |
| #434 chore(merge): update starbase (2026-10-08) | craft-store | closed | Merged routine maintenance update syncing craft-store to latest Starbase conventions, including CI workflows, build-system, and docs tooling updates. |