← Back to issue list

chore(merge): update starbase (2026-09-28)

View original Github issue

Metadata

Project
imagecraft
Number
#449
Type
pull request
State
merged
Author
jahn-junior
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

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.

Resolution: closed resolved

Reason: PR #449 was approved and merged as commit 545f51a. The resulting merge updates Imagecraft's shared tooling and preserves repository-specific lint, dependency, documentation, and CI conventions.

Evaluated by: mr-cal-bot

No scores available.

Issue body

Rebuilds the Starbase merge on the current tips of `origin/main` and `starbase/main`. Overview: - Only one new Starbase commit since the previous merge ([#601](https://github.com/canonical/imagecraft/pull/601)): a CI comment excluding the (already-excluded) PyPI publishing job from starbase-originated merges. No functional change. - `pyproject.toml`/`uv.lock`: merged per the file-ownership rules, took `docs-sphinx-stack` verbatim from `starbase/main` (fixing a stale `sphinx-sitemap` pin left over from the previous merge). - `docs/.sphinx` renamed to `docs/_dev` per Starbase's docs tooling restructure. - `Makefile`'s `lint-code` target keeps only `ruff`+`ty` for type checking/linting (this repo intentionally excludes `mypy`/`pyright`, see #231 and #328); see the PR comment for details. - `.github/README.md` deleted (Starbase-only onboarding doc, not applicable downstream). - `AGENTS.md` kept authoritative; `AGENTS.app.md`/`AGENTS.lib.md` deleted. **Known remaining `make lint` gap (unrelated, pre-existing):** `lint-docs` fails on a `vale` spellcheck gap ("Starbase"/"PRs"/"JARs" not in the docs wordlist), previously masked by an unrelated failure earlier in the lint chain. Not fixed in this PR — flagged for a follow-up.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved 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.
qwen/qwen3.8-27b — closed resolved Merged Starbase sync rebuilding the merge on current tips of origin/main and starbase/main; follow-up fixes (minimized uv.lock, sphinx-sitemap pin revert, runner labels, vale wordlist) folded into one merge commit. Prep PR #452 merged first; draft #456 made unnecessary.
stealth/space-bunny-alpha
Impact: 42
Quick Win: 11
Complexity: 58
Confidence: 78
Actionability: 62
needs review Maintainer Starbase sync: docs tooling migration to Sphinx Stack, common.mk/CI targets, AGENTS.md governance, pyproject/uv.lock updates across 41 files (+825/-499) with hand-resolved conflicts. lint/files fails on a pre-existing mypy finding split out to draft #452; spread tests pending.
stealth/space-bunny-alpha
Impact: 45
Quick Win: 12
Complexity: 58
Confidence: 78
Actionability: 63
needs review Maintainer Starbase sync updates documentation tooling, dependencies, governance, and CI across 40 files. No review comments; format and fast tests pass, but four checks remain pending.

Update history

Date Change
merged
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
updated
created

Related work

  • Related To: imagecraft#601 (confidence 98%)

    Its Starbase CI change was the only upstream update incorporated by this synchronization.

  • Related To: canonical/imagecraft#452 (confidence 96%)

    Merged first so the rebuilt Starbase merge could use the current origin/main tip.

Related issues

Issue Project State Summary Similarity
#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.
93%
#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.
92%
#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.
92%
#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.
92%
#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.
92%
#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.
91%
#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.
91%
#236 chore(merge): update starbase (2026-06-18) craft-platforms closed Starbase sync PR #236 was closed unmerged; rebuilt replacement #270 later merged Starbase into main as commit 4afcee7.
90%
#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.
90%
#268 chore(merge): update starbase (2026-10-23) craft-archives merged Syncs starbase/main into main, updating dependencies, removing obsolete mypy/pyright targets, and resolving merge conflicts. Merged successfully.
90%