← Back to issue list

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

View original Github issue

Metadata

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

Current evaluation

PR #2899 merged as commit 8da01822, syncing starbase/main tooling, workflows and docs infra into charmcraft (+692/-358, 38 files). Branch was rebuilt and force-pushed twice; prep PR #2897 landed first, #2898 was dropped.

Resolution: closed resolved

Reason: The PR itself was merged into main as commit 8da01822, replacing earlier merge commits e815cdb0 and c12162d9 after two force-pushes. Reviewer @lengau confirmed the remaining lint/files and OSV-scanner failures are unrelated to the merge. The `spread-enabled` actionlint self-hosted-runner label was folded into the merge commit.

Evaluated by: mr-cal-bot

No scores available.

Issue body

## Why Merges `starbase/main` into charmcraft to pick up the latest shared Starcraft tooling, workflows, and docs infrastructure updates. ## What - Merge performed via `prepare_merge.sh`, conflicts resolved per `file_ownership.md` - Placeholder Starcraft/Starbase text cleaned up post-merge - Validated with `make format`, `make lint`, `make docs`, `make test-fast` ## Related prep PRs The following prep PRs fix lint findings that only surface once this merge wires new tools (`actionlint`, `tombi`) into `make lint`/`make format`. They target `main` directly (not this branch) and should land before or independently of this merge: - #2897 — actionlint fixes - #2898 — tombi formatting ## Note This is a large, mostly-mechanical merge diff (shared tooling/workflow/docs sync from Starbase). Flagging as draft for review before finalizing.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved PR #2899 merged as commit 8da01822, syncing starbase/main tooling, workflows and docs infra into charmcraft (+692/-358, 38 files). Branch was rebuilt and force-pushed twice; prep PR #2897 landed first, #2898 was dropped.
stealth/space-bunny-alpha — closed resolved Merged as commit 8da01822 (PR #2899), syncing starbase/main tooling, workflows and docs infra into charmcraft (+692/-358, 38 files). Branch was force-pushed twice; prep PRs #2897/#2898 landed first; spread-enabled label added in .github/actionlint.yaml.
stealth/space-bunny-alpha
Impact: 32
Quick Win: 4
Complexity: 50
Confidence: 88
Actionability: 25
keep open Draft merge of starbase/main into charmcraft (2026-09-24), +819/-491 across 37 files (shared tooling, workflows, docs). Author says another pass is needed to strip bot-introduced unrelated changes; lint/files and OSV-scanner red.
stealth/space-bunny-alpha
Impact: 35
Quick Win: 2
Complexity: 65
Confidence: 88
Actionability: 20
keep open Draft merge of starbase/main into charmcraft (2026-09-24, +819/-491, 37 files) syncing shared tooling, workflows and docs; author says another pass is needed to strip bot-introduced unrelated changes.
stealth/space-bunny-alpha
Impact: 22
Quick Win: 2
Complexity: 60
Confidence: 88
Actionability: 18
keep open Draft merge of starbase/main into charmcraft (2026-09-24, +822/-494, 40 files) syncing shared tooling/workflows/docs. Maintainer still pruning bot-introduced unrelated changes; 5 unresolved comments, lint/files + OSV-scanner failing. Supersedes #2895.
stealth/space-bunny-alpha
Impact: 30
Quick Win: 1
Complexity: 55
Confidence: 92
Actionability: 5
close superseded Draft starbase/main merge into charmcraft (2026-09-24 sync, +822/-494, 40 files) picking up shared tooling/workflows/docs. Closed unmerged; maintainer restarted it as #2899 to strip unrelated bot-sneaked changes.
stealth/space-bunny-alpha
Impact: 25
Quick Win: 3
Complexity: 50
Confidence: 80
Actionability: 25
keep open Draft merge of starbase/main into charmcraft (2026-09-24 sync, +833/-493, 40 files) picking up shared tooling/workflows/docs. Author says another pass is needed to strip unrelated bot-sneaked changes; 7 unresolved comments, most CI still pending.
stealth/space-bunny-alpha
Impact: 30
Quick Win: 2
Complexity: 62
Confidence: 88
Actionability: 18
keep open Draft Starbase sync merge (+819/-476, 40 files) of shared tooling/workflows/docs. Author says bot sneaked in unrelated changes and needs another pass; lint/files and OSV-scanner failing; prep PRs #2897/#2898 pending.
stealth/space-bunny-alpha
Impact: 25
Quick Win: 2
Complexity: 55
Confidence: 70
Actionability: 22
keep open Draft starbase/main sync merge (+801/-473, 37 files) of shared tooling/workflows/docs; author needs another pass to prune unrelated bot changes; lint/files failing, 4 unresolved comments, prep PRs #2897/#2898 pending.
stealth/space-bunny-alpha
Impact: 30
Quick Win: 3
Complexity: 60
Confidence: 88
Actionability: 25
keep open Draft Starbase sync merge (+806/-425, 40 files) of shared tooling/workflows/docs; author says they need another pass to prune unrelated changes; 4 unresolved comments, lint/files and Build artefacts failing.
stealth/space-bunny-alpha
Impact: 45
Quick Win: 6
Complexity: 62
Confidence: 96
Actionability: 35
keep open Draft Starbase sync updates shared tooling, workflows, and docs. The maintainer is pruning unrelated changes; lint and build-artefact checks fail, and four review comments remain unresolved.
stealth/space-bunny-alpha
Impact: 43
Quick Win: 4
Complexity: 70
Confidence: 97
Actionability: 30
keep open Draft Starbase merge updates 156 files (+870/−461) with shared tooling, workflows, and docs. It awaits review; lint and build-artefact checks fail, tests are pending, and three prep PRs remain open.

Update history

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

Related work

  • Related To: canonical/charmcraft#2897 (confidence 95%)

    Prep PR fixing actionlint findings that surface once the merge wires actionlint into `make lint`; merged into main before the merge was rebuilt.

  • Related To: canonical/charmcraft#2898 (confidence 90%)

    Prep PR for tombi formatting of pyproject.toml, cited in the PR body, but closed unmerged without a resolving commit.

  • Duplicate Of: canonical/charmcraft#2894 (confidence 75%)

    Earlier unmerged attempt at the same tombi formatting of pyproject.toml that #2898 repeated; neither landed.

  • Related To: canonical/craft-application#15 (confidence 40%)

    Analogous merged Starbase tooling update in a sibling starbase-based project.

Related issues

Issue Project State Summary Similarity
#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.
86%
#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.
86%
#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.
86%
#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.
86%
#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.
85%
#2895 chore(merge): update starbase (2026-09-24) charmcraft closed Draft Starbase sync PR #2895 (2026-09-24) was closed unmerged; the same update was reworked as #2899 (2026-09-28), which merged as commit 8da01822 after prep PRs #2897/#2898.
85%
#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.
85%
#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.
85%
#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.
84%
#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.
84%