chore(merge): '8.2.11' into 'main'
Metadata
Current evaluation
Merged Snapcraft 8.2.11 into main via commit a6047cd0a, resolving the Application._get_dispatcher() conflict involving #4841 and #4732.
Resolution: closed resolved
Reason: PR #4852 was approved and merged into main as commit a6047cd0a, incorporating release 8.2.11 and resolving the noted minor conflict.
Evaluated by: mr-cal-bot
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`)
-----
This was a clean merge except for a minor conflict between #4841 and #4732 in `snapcraft.application.Application._get_dispatcher()`.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged Snapcraft 8.2.11 into main via commit a6047cd0a, resolving the Application._get_dispatcher() conflict involving #4841 and #4732. | |
| stealth/space-bunny-alpha | — | closed resolved | Snapcraft 8.2.11 was merged into main by #4852 (a6047cd0a), with a minor Application._get_dispatcher() conflict resolved. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged Snapcraft 8.2.11 into main via #4852 (a6047cd0a), resolving a minor Application._get_dispatcher() conflict. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged version 8.2.11 into main. Resolved a minor conflict in snapcraft.application.Application._get_dispatcher(). Approved by two reviewers with passing CI checks. Changes include 173 additions and 28 deletions across 9 files. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged version 8.2.11 into main. Resolved a minor conflict in snapcraft.application.Application._get_dispatcher() between PRs #4841 and #4732. All lint and test checks passed successfully. |
Update history
No update history recorded yet.
Related work
-
Likely Fixed By:
snapcraft#4841
(confidence 100%)
Its dotnet core22 fix was included in the 8.2.11 branch merged by #4852.
-
Related To:
snapcraft#4732
(confidence 100%)
It was the other side of the conflict in Application._get_dispatcher().
-
Related To:
snapcraft#4825
(confidence 95%)
The 8.2.11 release notes identify it as the dotnet core22 regression fixed in this release.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #4803 chore(merge): '8.2.7' into 'main' | snapcraft | merged | Merged Snapcraft 8.2.7 into main via approved PR #4803 at commit 1d873e817; 21 files changed (+475/-20). | |
| #4759 chore(merge): '8.2.1' into 'main' | snapcraft | closed | Snapcraft 8.2.1 was merged into main by replacement PR #4760 at commit 07b4ee15c; #4759 closed without completing the merge. | |
| #5183 chore(merge): 8.5.1 into main | snapcraft | merged | Merged Snapcraft 8.5.1 into main via #5183 (merge commit bfb63fa79), after approval by two reviewers. | |
| #4782 chore(merge): '8.2.3' into 'main' | snapcraft | closed | Snapcraft 8.2.3 was synchronized into main by approved zero-diff PR #4782, incorporating core24 fixes from #4770 and #4771. | |
| #5101 chore(merge): 8.4.2 into main | snapcraft | merged | Merged the Snapcraft 8.4.2 maintenance branch into main via #5101 (commit 82fa41a2c), integrating the 8.4.2 release changes. | |
| #5620 chore(merge): 8.10.2 into main | snapcraft | merged | Merged release branch 8.10.2 into main via commit 9828bbd04, finalizing Snapcraft 8.10.2. | |
| #5134 chore(merge): 8.4.4 into main | snapcraft | merged | Merged Snapcraft 8.4.3 and 8.4.4 into main via #5134 (commit 187187d53), bringing the 8.4.4 release changes into the main branch. | |
| #5260 chore(merge): 8.6.2 into main | snapcraft | merged | Merged Snapcraft 8.6.2 into main in #5260 (d34a021ac), retaining main's starbase and uv dependencies. | |
| #5567 chore(merge): 8.9.5 into main | snapcraft | merged | Merged release branch 8.9.5 into main in canonical/snapcraft#5567 (39a6620c1), updating all part keys in the snapcraft.yaml reference. | |
| #5429 chore(merge): 8.8.1 into main | snapcraft | merged | Merged hotfix/8.8 into main for Snapcraft 8.8.1 via PR #5429 (commit c74b9716b), with reviewer approval and no unresolved comments. |