chore(merge): update starbase (2026-07-22)
Metadata
Current evaluation
Merged after syncing starbase/main. Conflicts resolved by preserving child-repo uv.lock and pyproject.toml metadata while adopting shared Starbase tooling and workflows. All CI checks passed.
Suggested action: —
No scores available.
Issue body
Merge `starbase/main` into this branch and sync Starbase-managed updates.
Overview of Starbase changes pulled in:
- Added uv setup to renovate workflow and switched policy scan to osv-scanner config.
- Added shfmt tooling and Makefile targets for shell formatting/linting.
- Synced shared Starbase make logic in common.mk and added osv-scanner.toml.
- Kept repository-specific pyproject metadata and dependency-groups while preserving Starbase docs stack.
Conflict resolution applied:
- Kept child-repo version of `uv.lock` (child-owned file).
- Kept child-repo [project] metadata and dependency-groups in `pyproject.toml`.
- Took shared Starbase-managed updates for `common.mk`, policy/check-renovate workflows, and Makefile integration.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged after syncing starbase/main. Conflicts resolved by preserving child-repo uv.lock and pyproject.toml metadata while adopting shared Starbase tooling and workflows. All CI checks passed. | |
| qwen/qwen3.6-35b-a3b |
Staleness:
5
Complexity:
15
Confidence:
95
|
needs review | Maintenance merge updating shared Starbase tooling and workflows. Resolved conflicts by preserving child-repo metadata. Approved, all CI passing, ready to merge. |
Update history
| Date | Change |
|---|---|
| updated | |
| updated | |
| updated | |
| created |
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #387 chore(merge): update starbase (2026-06-18) | craft-store | merged | Merged starbase/main updates, pulling in shared docs and build tooling. Conflicts were resolved by preserving child-repo workflows and CODEOWNERS while adopting full common.mk and AGENTS updates. Approved with all CI checks passing. | |
| #236 chore(merge): update starbase (2026-06-18) | craft-platforms | closed | Merged starbase/main to sync managed updates, including build-system, CI workflows, documentation, and test tooling. The pull request successfully integrated these routine maintenance changes. | |
| #384 chore(merge): update starbase (2026-07-22) | imagecraft | closed | Merged starbase/main updates, resolving imagecraft child-repo conflicts and updating TICS project and PR template links. All CI checks passed prior to closure. | |
| #337 chore(merge): update starbase | craft-store | merged | Merged the starbase update after approval and CI checks. The PR consolidated upstream history and resolved documentation lint warnings. Changes were successfully integrated into the main branch. | |
| #377 chore(merge): update starbase | craft-store | merged | Merged update to Starbase dependencies since #337. Approved by two reviewers and passed CI checks despite an OSV-scanner failure. The merge applied 1688 additions and 929 deletions across 44 files. | |
| #238 chore(merge): update starbase (2026-07-16) | craft-archives | closed | Closed without merging due to an unrelated CI network timeout. The branch updated shared tooling, CI workflows, and docs scaffolding from canonical/starbase. A fresh merge PR will be opened later to complete the update. | |
| #5829 chore(merge): update starbase | snapcraft | merged | Merged following two approvals and successful CI checks. The update refreshes the starbase dependency to prepare for the 8.13.0 release, affecting four files. | |
| #5364 chore(merge): starbase into main | snapcraft | merged | Merged starbase into main ahead of the 8.8 release. Approved by three reviewers, passed CI checks, and updated eight files (+284/-63 lines). | |
| #6391 chore(merge): merge/starbase into main | snapcraft | merged | Merged into main, incorporating the latest starbase changes. Approved by two reviewers and passing CI checks despite two failing integration tests, the update modified 72 files with 1481 additions and 1163 deletions. | |
| #5443 chore(merge): starbase into main | snapcraft | merged | Merged starbase into main for the 8.9 release. Approved by two reviewers and passed CI checks despite one failing integration test. Completed with minimal changes (+2/-1). |