← Back to issue list

chore(merge): update starbase (2026-07-22)

View original Github issue

Metadata

Project
craft-store
Number
#409
Type
pull request
State
merged
Author
lengau
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged into main via commit 5802f2b. Starbase sync brought uv/OSV-scanner renovate+policy setup, shfmt tooling, common.mk updates and osv-scanner.toml, keeping repo-owned uv.lock and pyproject metadata; all CI green.

Resolution: closed resolved

Reason: The PR was merged into the default branch as commit 5802f2b ("chore(merge): update starbase (2026-07-22) (#409)"), after approval with all CI checks passing and no failures. The merged content is visible in the tree (e.g. policy.yaml referencing osv-scanner.toml, shfmt targets in common.mk and .pre-commit-config.yaml).

Evaluated by: mr-cal-bot

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
stealth/space-bunny-alpha — closed resolved Merged into main via commit 5802f2b. Starbase sync brought uv/OSV-scanner renovate+policy setup, shfmt tooling, common.mk updates and osv-scanner.toml, keeping repo-owned uv.lock and pyproject metadata; all CI green.
stealth/space-bunny-alpha — closed resolved Merged a Starbase sync adding uv/OSV-scanner setup, shfmt tooling, shared Make logic and osv-scanner.toml while preserving repository-owned uv.lock and pyproject metadata; all CI checks passed.
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 work

  • Related To: canonical/craft-store#387 (confidence 70%)

    Previous Starbase sync PR for the same recurring merge workflow.

  • Related To: canonical/craft-store#377 (confidence 60%)

    Earlier 'chore(merge): update starbase' PR following the same update path.

Related issues

Issue Project State Summary Similarity
#1189 chore(merge): update starbase (2026-10-05) craft-application merged Merged automated Starbase sync into main, updating CI workflows, repo configs, and osv-scanner ignores across 13 files.
91%
#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.
88%
#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.
88%
#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.
87%
#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.
87%
#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.
87%
#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.
86%
#177 chore(merge): update starbase (2026-07-22) debcraft closed Starbase merge PR #177 was closed unmerged because OSV-scanner failed; the maintainer confirmed main had the same issue and deferred a fresh merge PR.
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%
#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.
86%