chore(merge): 8.13 into main
Metadata
Current evaluation
Merged (commit 063c3c89e): hotfix/8.13 merged back into main, un-reverting #5857 (5b50af9cd) and cherry-picking 7404c56abd to fix an uv.lock conflict. Restores the project model changes for 8.13; no further 8.13 hotfixes planned.
Resolution: closed resolved
Reason: PR #5889 was approved and merged as 063c3c89e ('chore: revert "fix: revert project model changes (#5857)"'), restoring the project-model code in main after the 8.13 hotfix window closed, with a release-notes conflict fix and a uv.lock cherry-pick.
Evaluated by: mr-cal-bot
No scores available.
Issue body
In order to merge `hotfix/8.13` back into main, the project model changes reverted in #5857 need to be un-reverted (rereverted?).
This is just `git revert 5b50af9cd80304d185282b146c9975dbbb0d768c` followed by fixing a conflict in the release notes and cherry-picking 7404c56abd5376ba66c688c581fb10c8ff4f7978 to resolve a conflict in `uv.lock`.
There shouldn't be any more hotfix releases of 8.13 after this is merged.
---
- [x] I've followed the [contribution guidelines](https://github.com/canonical/snapcraft/blob/main/CONTRIBUTING.md).
- [x] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/).
- [x] I've successfully run `make lint && make test`.
- [ ] I've added or updated any relevant documentation.
- [ ] I've updated the relevant release notes.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged (commit 063c3c89e): hotfix/8.13 merged back into main, un-reverting #5857 (5b50af9cd) and cherry-picking 7404c56abd to fix an uv.lock conflict. Restores the project model changes for 8.13; no further 8.13 hotfixes planned. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged as #5889 (393b4dd51), restoring project model changes in main by undoing #5857 after the 8.13 hotfix. All CI checks passed; no further 8.13 hotfixes are intended. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged hotfix branch 8.13 into main. The commit reverts a prior revert, resolves release notes and uv.lock conflicts, and concludes the 8.13 hotfix cycle. Approved with passing CI checks. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged hotfix/8.13 into main by reverting prior changes and resolving conflicts in release notes and uv.lock. This finalizes the 8.13 release cycle with no further hotfixes planned. |
Update history
No update history recorded yet.
Related work
-
Likely Fixed By:
canonical/snapcraft#5857
(confidence 88%)
The original revert of the project-model changes (commit 5b50af9cd) that this PR un-reverts as part of merging hotfix/8.13.
-
Related To:
canonical/snapcraft#5843
(confidence 70%)
The underlying report about the wrong project model for non-app snaps that motivated the 8.13.1 hotfix and SNAPCRAFT-1252.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #6028 chore(merge): hotfix/8.14 into main | snapcraft | merged | Merged hotfix/8.14 into main via commit e8deb5855, bringing its CI fixes onto main after two approvals. | |
| #5044 chore(merge): work/merge-8.3-8.4 into main | snapcraft | merged | Merged #5044 into main, integrating hotfix/8.3 and hotfix/8.4 with two approvals; the branch was re-merged after main changed. | |
| #5992 chore(merge): merge/8.13 into hotfix/8.14 | snapcraft | merged | Merged hotfix/8.13 into hotfix/8.14 in dcefcbc72 (#5992), carrying over three previously overlooked, untagged fixes. | |
| #5745 chore(merge): hotfix/8.11 into main | snapcraft | closed | Superseded by PR #5747, which merged hotfix/8.11 into main as commit 3005d50aa for the 8.12 release. | |
| #5133 chore(merge): 8.4.4 into main | snapcraft | closed | Merged 8.4.4 maintenance changes into main via #5134, commit 187187d53. | |
| #1177 chore(merge): hotfix/7.2 into main | craft-application | merged | Merged hotfix/7.2 into main in commit 56398be7; fixes were already cherry-picked, and PR #1177 added the 7.2.1 changelog entry. | |
| #5888 chore: revert "fix: revert project model changes (#5857)" | snapcraft | closed | Merged as 063c3c89e, undoing #5857's revert and restoring the project model changes; #5889 then merged hotfix/8.13 into main. | |
| #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. | |
| #5669 chore(merge): hotfix/8.10 into main | snapcraft | merged | Merged hotfix/8.10 into main ahead of 8.11 via #5669 (commit 404316016); the unrelated integration-spread-tests-store failure did not block the merge. | |
| #924 chore(merge): hotfix/2.1 into main | craft-parts | closed | Merged hotfix/2.1 into main through PR #924, carrying 10 changed files (+50/-16). |