chore: merge 1.33 from main to 2.0 feature branch
Metadata
Current evaluation
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.
Resolution: closed resolved
Reason: PR #769 was merged as commit 251a88c5. After remaining test failures were reported, follow-up PR #798 was merged as d866f133 to re-merge main and address them.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | 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. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main’s 1.33 changes into feature/2.0 as 251a88c5; follow-up PR #798 later merged main again to clear test failures. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged #769 (251a88c5), integrating 1.33 from main into the 2.0 feature branch; a maintainer requested a re-merge to address test failures. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged the 1.33 branch from main into the 2.0 feature branch. Following approval, a re-merge was performed to resolve test failures, completing the integration successfully. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Successfully merged the 1.33 branch from main into the 2.0 feature branch. The branch was updated with main to resolve test failures before final integration. |
Update history
No update history recorded yet.
Related work
-
Likely Fixed By:
canonical/craft-parts#798
(confidence 98%)
Merged main into the 2.0 branch again after #769's test failures were reported.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #672 chore(merge): 2.0.3 into main | craft-providers | merged | Merged release branch 2.0.3 into main via commit fa805fb, completing the 2.0.3 integration. The planned 1.20.4 release was merged separately in #674. | |
| #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. | |
| #763 chore: merge 2.3.1 changes into main | craft-providers | merged | Merged the 2.3.1 changes into main via commit 7639939 in PR #763. | |
| #1030 chore(merge): 2.4.2 into main | craft-parts | merged | Merged 2.4.2 into main via #1030 (cde0d1a6), adding only the release changelog because the functional changes were already present. | |
| #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. | |
| #798 chore: merge main into 2.0 feature branch | craft-parts | merged | 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. | |
| #907 chore(merge): 2.1.3 into main | craft-parts | merged | Merged release 2.1.3 into main via #907 at commit 37dd40cb, including the version bump prepared in #906. | |
| #953 chore(merge): 1.25.3 into main | craft-parts | merged | Merged release branch 1.25.3 into main in 857152c8; only a nine-line changelog entry remained because dependency updates and CI fixes were already in main or irrelevant. | |
| #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. | |
| #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. |