chore(merge): 8.13 into main
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged hotfix/8.13 into main. Reverted previous model changes, resolved conflicts in release notes and uv.lock, and closed the 8.13 hotfix cycle. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #5026 chore(merge): 8.3.3 into main | snapcraft | merged | Merged version 8.3.3 into main. Added changelog notes for the hotfix release as main lacked them. No code changes were needed since dependencies were already updated. Approved by two reviewers and passed CI. | |
| #5429 chore(merge): 8.8.1 into main | snapcraft | merged | Successfully merged the 8.8.1 hotfix branch into main following approval from two reviewers and passing CI checks. The integration updated 10 files with 185 additions and 2 deletions, finalizing the release update. | |
| #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. | |
| #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. | |
| #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. | |
| #5990 chore(merge): merge/8.12 into hotfix/8.14 | snapcraft | merged | Merged hotfix/8.12 into hotfix/8.14 to incorporate the 8.12.1 tag and release notes. No code changes were introduced. Approved by two reviewers and passed all required CI checks before merging. | |
| #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. | |
| #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. | |
| #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. | |
| #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. |