← Back to issue list

chore(merge): update starbase (2026-10-16)

View original Github issue

Metadata

Project
craft-grammar
Number
#225
Type
pull request
State
merged
Author
LoweRAM
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged PR #225 syncing starbase/main into craft-grammar, updating CI, linting, and docs tooling, and resolving merge conflicts.

Resolution: closed resolved

Reason: The pull request was merged, successfully synchronizing starbase updates and resolving all merge conflicts. All CI checks passed upon merge.

Evaluated by: mr-cal-bot

No scores available.

Issue body

## Summary Syncs `starbase/main` (bdab610) into `craft-grammar` per the update-starbase workflow. Single merge commit on top of `main` (43df69f); replaces #219, which carried superseded history. Starbase changes pulled in: - **Type checking**: mypy and pyright removed (starbase #624) - the `lint-mypy`/`lint-pyright` targets, `install-pyright`, the pyright entry in `_setup-lint`, the mypy dependency, and the `.github/README.md` guidance. Craft Grammar already drops both (#215), so the shared files now agree with the child repository instead of conflicting with it. - **Build/CI**: `release-publish.yaml` (medium runners, PR dry-run trigger, `uv build` + `uvx twine check`) plus action pins, `setup-uv` v10.2.0 in `check-renovate.yaml`, `copilot-setup-steps.yaml` action pins. - **Lint/format configs**: ruff pre-commit hook at v0.17.0 (starbase #621), `.editorconfig`, actionlint self-hosted-runner label list, `common.mk` updates. - **Docs tooling**: docs subproject update guide (`docs/README.md`). ## Included non-Starbase fix The `classifiers` block in `pyproject.toml` is re-indented to two spaces per tombi. `main` reintroduced four-space indentation after #189 landed on top of #218, and the `lint-tombi` target this sync wires in fails without it. The change is folded into the single merge commit as requested; formatting only. ## Conflicts resolved - `Makefile` taken from starbase (its `lint-code` list now matches ours, tombi included); only child-owned `PROJECT`/`COVERAGE_SOURCE` restored. - `.github/workflows/check-renovate.yaml` and `.pre-commit-config.yaml` taken from starbase (ruff pin v0.17.0; no hook downgraded). - `pyproject.toml`, `docs/explanation/documentation.rst`, `tests/unit/starbase/test_init.py`, `uv.lock` kept child-repo versions. - `.github/README.md` kept deleted, as required for library repositories. ## Status - Draft, awaiting operator promotion. ## Test plan - [x] `make format` clean - [x] `make lint-code` passes - [x] `make lint-docs` passes - [x] `make docs` builds - [x] `make test-fast` passes (188 passed, 1 skipped) - [x] `uv lock --check` passes ## Copilot review disposition Copilot's review left two open high findings, both on fully Starbase-owned files; both are answered on-thread rather than patched locally, per the file-ownership map ("Always take `starbase/main`"): - `actionlint.yaml` (`linux` label): actionlint 1.7.9 as pinned by `common.mk` accepts this configuration - `lint-actions` passes on this PR, and `starbase/main` ships the same combination. If an allowlist entry is wanted, it belongs upstream in `canonical/starbase`. - `release-publish.yaml` (PR dry-run on self-hosted runners): inherited verbatim from `canonical/starbase#617`; publish steps are tag-gated. Any runner-isolation change belongs upstream so every child repo benefits. Offered to open the corresponding `canonical/starbase` issue(s).

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b — closed resolved Merged PR #225 syncing starbase/main into craft-grammar, updating CI, linting, and docs tooling, and resolving merge conflicts.

Update history

Date Change
updated
merged
updated
updated
updated
created

Related work

  • Superseded By: craft-grammar#219 (confidence 95%)

    The PR body explicitly states it replaces #219, which carried superseded history.

Related issues

Issue Project State Summary Similarity
#182 chore(merge): update starbase craft-grammar merged Merged to main as commit 23557e7 (CRAFT-4762), pulling Starbase into Craft Grammar. Starbase's diff was favoured over the outdated local config; only type-check (ty) fixes were hand-written, plus docs review notes.
92%
#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.
92%
#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.
91%
#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.
91%
#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.
91%
#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.
91%
#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.
91%
#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.
91%
#1028 chore(merge): update starbase (2026-10-19) craft-providers merged Merged #1028 updates craft-providers to starbase/main@3c895c5, incorporating dependency bumps, CI workflow updates, and build tooling changes while preserving child repository configurations.
91%
#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.
89%