chore: cherry-pick fixes to hotfix/8.3
Metadata
Current evaluation
Merged cherry-pick of two hotfixes and two test updates from main to hotfix/8.3. Approved by two reviewers with passing CI. Prepares the Snapcraft 8.3.2 release following the 8.4 delay and resolves failing CI checks.
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`)
-----
Snapcraft 8.4 is delayed due to https://github.com/canonical/snapcraft/pull/4884 and https://forum.snapcraft.io/t/kde-global-auto-connect-qt-common-themes/40878/15.
In the interim, we need an 8.3.2 release.
This PR cherry-picks 2 hotfixes and 2 test updates from `main`. The test updates will fix the failing CI in https://github.com/canonical/snapcraft/pull/4946.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged cherry-pick of two hotfixes and two test updates from main to hotfix/8.3. Approved by two reviewers with passing CI. Prepares the Snapcraft 8.3.2 release following the 8.4 delay and resolves failing CI checks. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged cherry-picks of two hotfixes and two test updates from main to the hotfix/8.3 branch to prepare for the Snapcraft 8.3.2 release and resolve CI failures. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged cherry-pick of two hotfixes and two test updates from main to the hotfix/8.3 branch. This enables the Snapcraft 8.3.2 release and resolves failing CI tests while the 8.4 release is delayed. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #5669 chore(merge): hotfix/8.10 into main | snapcraft | merged | Merged hotfix/8.10 into main to prepare for the 8.11 release. Approved by two reviewers and passed CI checks, with one unrelated spread test failure acknowledged and dismissed. | |
| #5747 chore(merge): hotfix/8.11 into main | snapcraft | merged | Merged hotfix/8.11 into main to prepare for the 8.12 release. Approved by two reviewers and passed CI checks. | |
| #6040 chore(merge): hotfix/8.14 into feature/kernel-initrd-plugin | snapcraft | merged | Merged hotfix/8.14 into feature/kernel-initrd-plugin to avoid unready Snapcraft 9 changes in main. Approved by two reviewers with passing CI checks. The branch was successfully integrated across 111 files. | |
| #5992 chore(merge): merge/8.13 into hotfix/8.14 | snapcraft | merged | Merged hotfix/8.13 into hotfix/8.14 to include three previously overlooked commits. Approved by two reviewers and passed CI checks before integration. | |
| #4574 chore: merge 8.0.3 hotfix into main | snapcraft | merged | Merged the 8.0.3 hotfix into main. Approved by two reviewers, passed CI checks, and maintained stable code coverage at 88.33%. The commit touched 11 files with 214 additions and 26 deletions. | |
| #6041 chore(merge): hotfix/8.14 into feature/ubuntu-kernel-plugin | snapcraft | merged | Merged hotfix/8.14 into feature/ubuntu-kernel-plugin to bypass unstable Snapcraft 9 changes on main. Approved by two reviewers and passed CI checks despite one failing store test. 52 files changed. | |
| #6028 chore(merge): hotfix/8.14 into main | snapcraft | merged | Merged hotfix/8.14 into main to bring CI fixes to the primary branch. Approved by two reviewers and passed CI checks. Updated 25 files with 268 additions and 76 deletions. | |
| #5044 chore(merge): work/merge-8.3-8.4 into main | snapcraft | merged | Merged hotfix/8.3 and hotfix/8.4 into main. Approved by two reviewers and passed CI. Force-pushed once to sync with main before final integration. | |
| #4824 chore: merge 8.2.9 hotfixes | snapcraft | merged | Merged after approval from two reviewers. Integrates 8.2.9 hotfixes across six files. A reviewer noted unrelated CI failures due to network issues, but the changes were successfully merged. | |
| #4953 chore(merge): '8.3.2' into 'main' | snapcraft | merged | Merged release 8.3.2 into main. Includes a backported changelog commit for the hotfix branch. Approved by two reviewers, passed CI, and resolves CRAFT-3162 and CRAFT-3103. |