chore: merge 1.33 from main to 2.0 feature branch
Metadata
Current evaluation
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.
Suggested action: —
No scores available.
Issue body
- [ ] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
-----
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| 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 issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #798 chore: merge main into 2.0 feature branch | craft-parts | merged | 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. | |
| #953 chore(merge): 1.25.3 into main | craft-parts | merged | Merged 1.25.3 into main after two approvals and passing CI. The branch contained no code changes as dependency updates and CI fixes were already in main or irrelevant. A changelog entry was added to document the merge. | |
| #1040 chore(merge): 2.4.3 into main | craft-parts | merged | Successfully merged into main after approval by two reviewers. Version 2.4.3 was integrated into the main branch, updating four files with 13 additions and 2 deletions. | |
| #336 chore(merge): '2.6.3' into 'main' | craft-application | merged | Merged version 2.6.3 into the main branch. The pull request passed CI checks, received approval from two reviewers, and updated four files with 109 additions and 41 deletions. | |
| #972 chore: merge 2.2.2 to main | craft-parts | merged | Merged version 2.2.2 into main, replacing a previous hotfix branch merge. Approved by two reviewers with no unresolved comments. The change adds two lines to synchronize the release branch with main. | |
| #803 chore!: merge 2.0 feature branch to main | craft-parts | merged | Merged the 2.0 feature branch into main following two reviewer approvals. Introduces breaking changes: Python 3.10 minimum, Debian architecture names, and plugin model restructuring. 168 files changed. | |
| #1212 chore: merge 2.20.1 to main | craft-parts | closed | Version 2.20.1 merge to main was approved and passed all CI checks, but was closed and superseded by PR #1223. | |
| #1211 chore: merge 2.20.1 to main | craft-parts | closed | Merged to main. All CI checks passed successfully. The pull request required no reviewer comments or changes before integration. | |
| #1430 chore: merge 2.5.3 to main | charmcraft | closed | Approved updates to merge version 2.5.3 into main, containing bug fixes and dependency changes, were closed and superseded. The author indicated the branch required updating, necessitating a new pull request rather than merging this one. | |
| #376 chore(merge): merge '2.9.0' into 'main' | craft-application | merged | Merged version 2.9.0 into main following CI passes and two approvals. A reviewer noted they merged PR #373 before this staged merge, requiring a redo, but the integration completed successfully. |