chore(merge): update starbase (2026-06-18)
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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 |
|---|---|---|---|---|
| #409 chore(merge): update starbase (2026-07-22) | craft-store | merged | 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. | |
| #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. | |
| #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. | |
| #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. | |
| #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). | |
| #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. | |
| #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. | |
| #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. | |
| #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). |