Merge `rockcraft` back into `main`
Metadata
Current evaluation
Merged the rockcraft branch into main via #590 after individual review, adding 2.6.0 changelog entries across six files; approved by two reviewers.
Resolution: closed resolved
Reason: PR #590 was merged into main after individual commit review. It had two approvals, no unresolved review comments, and added the 2.6.0 changelog entries.
Evaluated by: mr-cal-bot
No scores available.
Issue body
The commits have been individually reviewed, with the exception of the latest one which has the new changelog entries.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged the rockcraft branch into main via #590 after individual review, adding 2.6.0 changelog entries across six files; approved by two reviewers. | |
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged the `rockcraft` branch into `main` via craft-cli#258, adding changelog entries for version 2.6.0 across six files. Approved by two reviewers with no unresolved comments. |
Update history
| Date | Change |
|---|---|
| created |
Related work
-
Related To:
canonical/rockcraft#120
(confidence 78%)
Merged as 3f887b70, this PR replaced Rockcraft's local provider classes with the craft-providers interface.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #767 Merge `rockcraft` back to `main` | craft-parts | merged | Merged PR #767 restored the rockcraft branch to main with reviewed 1.33.0 changelog entries; two reviewers approved it. | |
| #258 Merge `rockcraft` back into `main` | craft-cli | merged | Merged PR #258 restored the rockcraft branch to main and added the missing Craft CLI 2.6.0 changelog entries. | |
| #372 Merge `rockcraft` | craft-application | merged | PR #372 merged into the temporary 2.x branch, adding reviewed rockcraft work and commit ccfe498d's corrected craft-cli/craft-parts constraints for the planned 2.9.0 release. | |
| #454 12f merge | rockcraft | merged | Merged PR canonical/rockcraft#454 into the target branch after maintainer approval, integrating 123 files (+2011/-1422). | |
| #916 chore(merge): merge 'starbase/main' | rockcraft | merged | Merged starbase/main into Rockcraft main via canonical/rockcraft#916 (commit 4ea99312), with approval and all CI checks passing. | |
| #843 chore(merge): 'starbase/main' into 'main' | rockcraft | merged | Merged Starbase/main into rockcraft main via #843 (e4d7064a); follow-up commits starting at 001e1215 cleaned up conflict artifacts across GitHub config, docs, build files, tests, and dependencies. | |
| #254 docs: include contribution information | rockcraft | merged | Merged contribution documentation updates in rockcraft#254 via commit 24e0c3ab, changing 4 files (+84/-34) and approved by three reviewers. | |
| #1302 docs: release notes for 1.20 | rockcraft | merged | Docs-only PR #1302 by maintainer tigarmo merged into rockcraft main as commit 289c48bc, adding 119 lines across two files: Rockcraft 1.20 release notes plus the index entry. Approved by 2 reviewers. | |
| #856 refactor: use craft-application 5 | rockcraft | merged | Merged as commit 2139bcd2: refactored Rockcraft onto craft-application 5 (49 files, +959/-915) after approval from 3 reviewers; later bumped to craft-application 6.0 via #1027. | |
| #453 chore: merge origin/main | rockcraft | closed | Closed unmerged; PR canonical/rockcraft#468 later completed the main-into-feature/12f synchronization. |