chore(merge): merge/8.12 into hotfix/8.14
Metadata
Current evaluation
Merged hotfix/8.12 into hotfix/8.14 in 12616913d, bringing the 8.12.1 tag and release notes forward; no code changes were included.
Resolution: closed resolved
Reason: PR #5990 was approved and merged as commit 12616913d. It synchronized the 8.12.1 tag and release notes into hotfix/8.14; the only carried change was outdated.
Evaluated by: mr-cal-bot
No scores available.
Issue body
Merges the `hotfix/8.12` tag into `hotfix/8.14`, to bring in the 8.12.1 tag and release notes.
There was only one change in 8.12.1 and it's outdated, so there are no code changes here.
---
- [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/).
- [ ] 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 hotfix/8.12 into hotfix/8.14 in 12616913d, bringing the 8.12.1 tag and release notes forward; no code changes were included. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged as commit 12616913d, updating hotfix/8.14 with the 8.12.1 tag and release notes; no code changes were included. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #5990 as commit 12616913d, bringing the 8.12.1 tag and release notes from hotfix/8.12 into hotfix/8.14 without code changes. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged #5990 (12616913d), bringing the 8.12.1 tag and release notes into hotfix/8.14 with no code changes. | |
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged hotfix/8.12 into hotfix/8.14 to apply the 8.12.1 tag and release notes. No code changes were included since the prior hotfix was outdated. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #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. | |
| #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. | |
| #4534 chore: 8.0.2 hotfixes | snapcraft | closed | Closed unmerged; identical 8.0.2 hotfixes were merged through PR #4535 as commit bbf8ae08f. | |
| #5889 chore(merge): 8.13 into main | snapcraft | merged | 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. | |
| #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. | |
| #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. | |
| #4792 chore: merge 8.2 hotfix branch | snapcraft | merged | Merged via #4792 (commit 707385a0d), bringing hotfix/8.2 back to main; the resulting 8.2.5 release fixed a cryptography regression in Store operations. | |
| #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. | |
| #1620 chore(merge): hotfix/2.33 into main | craft-parts | merged | Merged into main as 4b04d8ff, adding the 2.33.1 changelog entry; the hotfix changes had already been cherry-picked from main. |