chore(merge): 'main' into 'feature/components'
Metadata
Current evaluation
Merged main into feature/components to resolve issue #4576. The pull request was closed following the integration.
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 to resolve issue #4576. The pull request was closed following the integration. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/components, resolving issue #4576. The branch passed linting and testing checks prior to integration. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/components, resolving issue #4576. The branch incorporated upstream changes and was closed following the merge. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #4581 chore(merge): 'main' into 'feature/components' | snapcraft | merged | Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files. | |
| #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. | |
| #1595 chore: Merge main back to feature/12f | charmcraft | closed | Main branch was merged into feature/12f to keep it up-to-date. The pull request was closed. | |
| #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. | |
| #5299 chore(merge): 8.6.3 into main | snapcraft | merged | Merged into main following approval and passing CI. The pull request only updated the changelog for version 8.6.3, as the corresponding code changes were already present in the main branch. | |
| #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. | |
| #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. | |
| #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. | |
| #5133 chore(merge): 8.4.4 into main | snapcraft | closed | Successfully merged version 8.4.4 into the main branch without conflicts. The pull request was closed after completion, with all contribution guidelines acknowledged and no review comments or CI failures reported. | |
| #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. |