chore(merge): update starbase (2026-06-18)
Metadata
Current evaluation
Merged PR #387 in commit 5c83549, updating Starbase docs/build tooling while preserving craft-store-specific CI and CODEOWNERS files.
Resolution: closed resolved
Reason: PR #387 was approved and merged as commit 5c83549. It adopted Starbase's common.mk and AGENTS.md updates while retaining repository-specific conflict resolutions.
Evaluated by: mr-cal-bot
No scores available.
Issue body
AUTHOR NOTE: While this is a real Starbase merge, it is also a test of the in-development agent skill for updating Starbase, found at https://github.com/canonical/copilot-collections/pull/50
Please review both this PR and that skill in case you disagree with the conflict resolution instructions I have made.
## Summary
- merge `starbase/main` into this branch
- pull in Starbase updates for shared docs/build tooling
- resolve merge conflicts using repository-specific rules
## Overview of Starbase changes pulled in
- update `common.mk` docs/build targets, including docs-install execution flow and docs-clean behavior
- refresh docs subproject update guidance in `docs/README.md`
- add `Starbase` to `docs/.custom_wordlist.txt`
- pull AGENTS wording typo fix in `AGENTS.md`
## Conflict resolution applied
- kept child-repo version of `.github/CODEOWNERS` (`--ours`)
- kept child-repo version of `.github/workflows/qa.yaml` (`--ours`)
- took full `common.mk` from `starbase/main` (source-of-truth file)
- for this library repo, kept `AGENTS.app.md` and `AGENTS.lib.md` deleted; kept `AGENTS.md` authoritative
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #387 in commit 5c83549, updating Starbase docs/build tooling while preserving craft-store-specific CI and CODEOWNERS files. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged Starbase sync (merge commit 5971252, squashed as 5c83549): pulled upstream common.mk, docs/README.md, wordlist and AGENTS.md fixes; kept local CODEOWNERS/qa.yaml; AGENTS.app/lib stay deleted. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged #387 in commit 5c83549, updating Starbase docs/build tooling; conflict resolution preserved local CI/CODEOWNERS and adopted upstream common.mk and AGENTS.md. | |
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged starbase/main to update docs and build tooling. Conflicts resolved by keeping child-repo CODEOWNERS and qa.yaml, adopting full common.mk, and retaining AGENTS.md. The merge also validated an in-development agent skill. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #377 chore(merge): update starbase | craft-store | merged | Merged Starbase updates into craft-store in commit 3c9f44f, bringing in changes accumulated since #337. | |
| #434 chore(merge): update starbase (2026-10-08) | craft-store | closed | Merged routine maintenance update syncing craft-store to latest Starbase conventions, including CI workflows, build-system, and docs tooling updates. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. |