chore(merge): 'main' into 'feature/components'
Metadata
Current evaluation
Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files.
Suggested action: —
No scores available.
Issue body
- [x] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)?
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [x] Have you successfully run `tox run -m lint`?
- [x] Have you successfully run `tox run -e test-py310`? (supported versions: `py39`, `py310`, `py311`, `py312`)
-----
Merge `main` into `feature/components`.
Fixes #4576
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/components to resolve issue #4576. Branch passed lint, test, and Codecov checks before integration by maintainer mr-cal. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/components to resolve issue #4576. Linting, tests, and Codecov coverage checks passed. The branch was successfully integrated. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #4579 chore(merge): 'main' into 'feature/components' | snapcraft | closed | Merged main into feature/components to resolve issue #4576. The pull request was closed following the integration. | |
| #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. | |
| #1172 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources after resolving conflicts and integrating documentation and workflow fixes. Approved by two reviewers and passed CI checks. | |
| #1050 chore(merge): feature/pro-sources into main | craft-application | merged | Merged feature/pro-sources into main, resolving CRAFT-5016. Approved by two reviewers and passed CI checks. Adds 1554 lines across 19 files. | |
| #5393 chore(merge): feature/snapcraft-test into main | snapcraft | merged | Merged feature/snapcraft-test into main after two reviewer approvals. The change updated 54 files and passed most CI checks, with failing spread tests acknowledged for later resolution on main. | |
| #1459 chore(merge): main into feature/override_overlay | craft-parts | merged | Merged main into feature/override_overlay after two approvals and passing all CI checks. The update added 2528 lines and removed 207 across 72 files, synchronizing the feature branch with main. | |
| #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. | |
| #1031 chore(merge): main into feature/pro-sources | craft-application | merged | Merged main into the stale feature/pro-sources branch via a manual merge due to prior squash merges and outdated base. CI failures were expected and accepted. Approved and merged to enable upcoming cleanup and final integration. | |
| #1584 chore(merge): feature/ca-2 into main | charmcraft | closed | Merged feature/ca-2 into main by maintainer mattculler. Closed after 26 additions and 599 deletions across 9 files. No reviews or CI checks were required. | |
| #1184 chore(merge): feature/pro-sources into main | rockcraft | merged | Squash merged feature/pro-sources into main following two reviewer approvals and successful CI checks. The commit updated 36 files with 578 additions and 26 deletions. |