← Back to issue list

chore: prepare for a starbase merge

View original Github issue

Metadata

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

Current evaluation

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.

Resolution: closed resolved

Reason: The PR was approved by three reviewers and squash-merged into main as commit 88685a04, doing only non-semantic docs style fixes plus removal of a stray "YMMV." line. Its stated purpose was completed by the follow-up PR #1265 (61c7d94c) which merged the Starbase history, and the noqa debt it introduced was cleaned up in #1340 (656270ad).

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you added an entry to the changelog (`docs/reference/changelog.rst`)? ----- Preparations for a Starbase merge. Automatically generated commits are marked with the `(autogen)` scope. This PR should be squashed, then a subsequent PR will be opened to actually merge the Starbase history. The huge volume of `noqa`s in particular were necessary, and will be addressed in a follow-up PR. TAs: There shouldn't be any semantic changes to the docs, just a _lot_ of `trailing-whitespace` and `line-too-long` fixes. One exception however was me removing "YMMV." from a line in some Rust plugin docs, as it felt out of place and it wasn't adding anything.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved 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.
stealth/space-bunny-alpha — closed resolved Merged via squash to prepare for Starbase integration, applying automated style fixes, whitespace cleanup and minor documentation edits.
qwen/qwen3.6-35b-a3b — — Merged via squash to prepare for a Starbase merge. Applied automated style fixes, whitespace cleanup, and minor doc edits. Approved by three reviewers. Test failures from non-root snap permissions were diagnosed and linked to a separate fix PR.
qwen3.6-35b-a3b-mtp-q6 — — Merged after fixing test failures from non-root execution blocking snap installs. The PR squashes auto-generated commits to prepare for a Starbase merge, applying whitespace and line-length fixes while deferring noqa cleanup.

Update history

No update history recorded yet.

Related work

  • Likely Fixed By: canonical/craft-parts#1265 (confidence 90%)

    Follow-up PR 'chore(merge): bring in starbase history' (61c7d94c) that actually performed the Starbase merge this PR prepared for.

  • Related To: canonical/craft-parts#1340 (confidence 80%)

    'style: add easy noqa fixes' (656270ad) addressed the excessive noqa additions this PR introduced.

  • Related To: canonical-repo-automation#337 (confidence 55%)

    Cited by lengau as the fix for the failing 'Minimum dependencies' test job caused by snap install running as non-root.

Related issues

Issue Project State Summary Similarity
#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%
#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%
#340 chore: prepare for starbase merge craft-cli merged Merged in commit e05899f as PR #340, landing Starbase preparation fixes; the planned follow-up Starbase merge landed in #787.
85%
#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.
84%
#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.
84%
#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.
83%
#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.
83%
#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.
83%
#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.
82%
#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.
82%