← Back to issue list

chore: prepare for starbase merge

View original Github issue

Metadata

Project
craft-cli
Number
#340
Type
pull request
State
merged
Author
bepri
Labels
—
Created
Updated
Closed

Current evaluation

Merged in commit e05899f as PR #340, landing Starbase preparation fixes; the planned follow-up Starbase merge landed in #787.

Resolution: closed resolved

Reason: PR #340 was approved with all CI checks passing and merged as commit e05899f. The maintainer confirmed the squash-then-separate-merge plan, with the follow-up Starbase merge recorded as #787 and commit 21f2ac7.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the guidelines for contributing? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [ ] Have you successfully run `tox`? Lots of papercut fixes separated from the starbase merge to keep the commit history in the PR calm. The merge commit will happen in a separate PR after this gets merged.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged in commit e05899f as PR #340, landing Starbase preparation fixes; the planned follow-up Starbase merge landed in #787.
stealth/space-bunny-alpha — closed resolved Merged PR #786 to land Starbase preparation fixes separately; the subsequent Starbase rebase was merged in #787.
stealth/space-bunny-alpha — closed resolved Merged in canonical/craft-providers#786 to land preparatory fixes separately from the subsequent Starbase history merge.
stealth/space-bunny-alpha — closed resolved Merged as e05899f, squash-landing papercut fixes separately ahead of the Starbase history merge, which later landed in canonical/craft-cli#343.
stealth/space-bunny-alpha — closed resolved Squash-merged #340 with papercut fixes in preparation for a separate Starbase merge; two reviewers approved it and all reported CI checks passed.
qwen/qwen3.6-35b-a3b — — Merged via squash commit to apply papercut fixes and prepare for a subsequent starbase merge PR. Approved by reviewers and passed all CI checks.

Update history

No update history recorded yet.

Related work

  • Likely Fixed By: craft-cli#787 (confidence 95%)

    Completed the follow-up Starbase rebase/merge after the preparation changes landed.

  • Related To: craft-cli#786 (confidence 88%)

    Separated Starbase preparation fixes from the actual merge.

Related issues

Issue Project State Summary Similarity
#785 chore: prepare for starbase merge craft-providers closed Closed unmerged to rename the source branch; the same Starbase preparation landed through PR #786 as commit 1b046c0, followed by merged PR #787 to rebase onto Starbase.
91%
#786 chore: prepare for starbase merge craft-providers merged Merged as 1b046c0 (squashed): manual changes prepping craft-providers for the Starbase merge, deliberately keeping existing noqa comments. Follow-up PR #787 (808597b) brought in Starbase history.
88%
#1253 chore: prepare for a starbase merge craft-parts merged Squash-merged as 88685a04 (chore: prepare for a starbase merge), a docs/CI style-only prep change (trailing-whitespace, line-too-long, many noqa additions) preceding the real Starbase history merge.
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.
83%
#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.
82%
#728 chore: switch to starbase craft-providers closed Closed unmerged after review remained pending; the Starbase migration was later completed by #786/#787, with #787 merged as commit 808597b.
82%
#236 chore(merge): update starbase (2026-07-14) craft-archives closed Closed unmerged; the Starbase update was later merged through #252 in commit 1b56643.
82%
#30 chore: merge starbase craft-grammar closed Closed unmerged; the starbase integration landed on main via commit 3a6f6c4 (chore(merge): 'starbase' into 'main').
82%
#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.
82%
#252 chore(merge): starbase into main craft-archives merged Merged Starbase into main via PR #252 after two approvals; all CI checks passed, with 53 files changed (+2570/-1262).
82%