chore: merge main into 2.0 feature branch
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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 issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #769 chore: merge 1.33 from main to 2.0 feature branch | craft-parts | merged | 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. | |
| #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. | |
| #1475 chore(merge): main into feature/pro-sources | craft-parts | merged | Merged main into feature/pro-sources following two approvals. The maintainer anticipated CI failures and scheduled a separate cleanup PR. The branch was merged as a preparatory step despite failing edge-case tests. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged main into feature/12f to synchronize branches. Approved by one reviewer, passed CI checks, and successfully merged by external contributor gregory-schiano. | |
| #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. | |
| #4777 chore(merge): '8.2.2' into 'main' | snapcraft | merged | Merged version 8.2.2 into main after approval from two reviewers. Unrelated test failures were addressed separately. The branch was successfully integrated. | |
| #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. | |
| #1965 chore: merge 3.2.2 to main | charmcraft | merged | Successfully merged maintainer chore PR to integrate version 3.2.2 into main. Approved by two reviewers with a single-file, seven-line update. Completed without CI failures. | |
| #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. | |
| #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. |