← Back to issue list

chore(merge): hotfix/8.14 into feature/kernel-initrd-plugin

View original Github issue

Metadata

Project
snapcraft
Number
#6040
Type
pull request
State
merged
Author
mr-cal
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged hotfix/8.14 into feature/kernel-initrd-plugin (commit d82cc2b8e, PR #6040) to pick up 8.14 fixes without pulling unreleased Snapcraft 9 changes from main. Feature later landed in main via #6284.

Resolution: closed resolved

Reason: The PR was merged with 2 approvals as commit d82cc2b8e, syncing the 8.14 hotfix line into the kernel/initrd feature branch as an interim step; main was synced in later via #6110 (bb354f749) and #6255 (6598b614e), and the branch was merged into main by #6284 (ceace05f3).

Evaluated by: mr-cal-bot

No scores available.

Issue body

Merges `hotfix/8.14` into `feature/kernel-initrd-plugin`. I chose `hotfix/8.14`, since `main` has Snapcraft 9 changes in-progress and isn't production ready. --- - [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`. - [x] I've added or updated any relevant documentation. - [x] I've updated the relevant release notes.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged hotfix/8.14 into feature/kernel-initrd-plugin (commit d82cc2b8e, PR #6040) to pick up 8.14 fixes without pulling unreleased Snapcraft 9 changes from main. Feature later landed in main via #6284.
stealth/space-bunny-alpha — closed resolved Merged hotfix/8.14 into feature/kernel-initrd-plugin via PR #6040 (commit d82cc2b8e), avoiding unreleased Snapcraft 9 changes on main.
qwen/qwen3.6-35b-a3b — — 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.
qwen3.6-35b-a3b-mtp-q6 — — Merged hotfix/8.14 into feature/kernel-initrd-plugin to avoid in-progress Snapcraft 9 changes on main. The merge completed successfully without conflicts or additional review comments.

Update history

No update history recorded yet.

Related work

  • Likely Fixed By: canonical/snapcraft#6284 (confidence 90%)

    Follow-up PR merging feature/kernel-initrd-plugin into main (commit ceace05f3), the final delivery of this merge's work.

  • Related To: canonical/snapcraft#6255 (confidence 80%)

    Later sync of main into the same feature branch (commit 6598b614e), superseding this interim hotfix sync.

  • Related To: canonical/snapcraft#6110 (confidence 75%)

    First sync of main into feature/kernel-initrd-plugin (commit bb354f749), which replaced the 8.14 hotfix as the integration base.

  • Related To: canonical/snapcraft#6028 (confidence 55%)

    Sibling merge of hotfix/8.14 into main, the same 8.14 hotfix content this PR propagated to the feature branch.

Related issues

Issue Project State Summary Similarity
#6041 chore(merge): hotfix/8.14 into feature/ubuntu-kernel-plugin snapcraft merged Merged hotfix/8.14 into feature/ubuntu-kernel-plugin via #6041, bringing production-ready 8.14 changes forward while avoiding unreleased Snapcraft 9 work on main.
94%
#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.
82%
#4574 chore: merge 8.0.3 hotfix into main snapcraft merged Merged the Snapcraft 8.0.3 hotfix branch into main via PR #4574 at commit 5bf03c2ea, consolidating maintenance changes across 11 files.
82%
#4786 chore: merge hotfix 8.2 into main snapcraft merged Merged hotfix/8.2 into main via PR #4786 at commit b3900587b, integrating the Snapcraft 8.2 maintenance changes.
82%
#5747 chore(merge): hotfix/8.11 into main snapcraft merged Merged hotfix/8.11 into main via commit 3005d50aa (#5747), preparing Snapcraft 8.12 after approval; two integration-test jobs remained failing.
81%
#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.
81%
#4949 chore: cherry-pick fixes to hotfix/8.3 snapcraft merged Merged #4949 into hotfix/8.3, adding two fixes and two CI test updates for Snapcraft 8.3.2; #4953 later merged the release into main (3cdb859f7).
79%
#6110 chore(merge): main into feature/kernel-initrd-plugin snapcraft merged Merged as bb354f749, syncing main into feature/kernel-initrd-plugin to simplify review. The kernel/initrd feature changes later landed through #6116 and #6284.
78%
#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.
78%
#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.
77%