chore: merge main into 2.0 feature branch
Metadata
Current evaluation
Merged main into the feature/2.0 branch via commit d866f133 (branch work/main-to-2.0) to clear CI failures. Approved by 2 reviewers; 40 files changed, +203/-125. Merge-only chore PR.
Resolution: closed resolved
Reason: The PR itself was merged into the 2.0 feature branch as commit d866f133 ('Merge pull request #798 from canonical/work/main-to-2.0'), combining merge commits from 'Merge branch main into work/main-to-2.0' to resolve the reported CI issues.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
This should fix the CI issues
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged main into the feature/2.0 branch via commit d866f133 (branch work/main-to-2.0) to clear CI failures. Approved by 2 reviewers; 40 files changed, +203/-125. Merge-only chore PR. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/2.0 in craft-providers PR #614, resolving the feature branch’s CI issues after approval by two reviewers. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged to resolve CI failures by integrating main into the 2.0 feature branch. Approved by two reviewers with passing checks. The maintainer synchronized the branches to restore continuous integration. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the 2.0 feature branch to resolve continuous integration failures. The maintainer completed the merge without additional review comments. |
Update history
No update history recorded yet.
Related work
-
Related To:
craft-providers#913
(confidence 40%)
Analogous chore merge of main into a long-lived feature branch in the renamed craft-providers repo; same pattern, no direct dependency on #798.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #614 chore: merge branch 'main' into 'feature/2.0' | craft-providers | merged | Merged main into feature/2.0 as a branch-sync update in commit 87435d0 after maintainer approval. | |
| #769 chore: merge 1.33 from main to 2.0 feature branch | craft-parts | merged | Merged 1.33 from main into the 2.0 feature branch in 251a88c5; follow-up #798 re-merged main in d866f133 to fix remaining test failures. | |
| #1223 chore(merge): 2.20.1 into main | craft-parts | merged | Merged the 2.20.1 release branch into main via PR #1223 (commit 30ea3701); all reported CI checks passed. | |
| #1040 chore(merge): 2.4.3 into main | craft-parts | merged | Merged version 2.4.3 into main via PR #1040, landing as commit fab7fa92 after two reviewer approvals. | |
| #913 chore(merge): main into feature/pro-sources | craft-providers | merged | Merged main into the long-lived feature/pro-sources branch (commit f7edf3d) after a complex conflict caused by squashed PR #721; lint/test CI failures were accepted and deferred. The branch later landed in main via #918 (b56ff14). | |
| #1184 chore(merge): feature/pro-sources into main | rockcraft | merged | Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals. | |
| #972 chore: merge 2.2.2 to main | craft-parts | merged | Merged 2.2.2 into main via PR #972 at commit 2361322c, adding two changelog lines after two approvals. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. | |
| #1361 chore: update feature branch from main | charmcraft | closed | Maintenance-only PR refreshing a 2.0 feature branch with main (53 files, +545/-515) was closed unmerged, made redundant by merged craft-providers#614 which merged main into feature/2.0. | |
| #642 chore(merge): 1.24.2 into main | craft-providers | merged | Merged release 1.24.2 into main via PR #642 at commit cf9fb1f, after approval from two reviewers. |