← Back to issue list

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

View original Github issue

Metadata

Project
snapcraft
Number
#6110
Type
pull request
State
merged
Author
dilyn-corner
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged main into feature/kernel-initrd-plugin to streamline upcoming reviews. Approved by two reviewers and passed CI. Marginally supersedes PR #6102. Branch target was corrected during review.

Suggested action: —

No scores available.

Issue body

Purely merging whatever is on `HEAD` into feature/kernel-initrd-plugin for ease of reviewing (forthcoming) PR. Marginally supercedes #6102. --- - [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
qwen/qwen3.6-35b-a3b — — Merged main into feature/kernel-initrd-plugin to streamline upcoming reviews. Approved by two reviewers and passed CI. Marginally supersedes PR #6102. Branch target was corrected during review.
qwen3.6-35b-a3b-mtp-q6 — — Merged main into feature/kernel-initrd-plugin to streamline upcoming reviews, marginally superseding #6102. A target branch misconfiguration was noted but did not block the merge.
qwen3.6-35b-a3b-mtp-q6 — — Merged main into feature/kernel-initrd-plugin to streamline reviewing for an upcoming PR, superseding #6102. Although initially targeted at main instead of the feature branch, the merge completed successfully.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#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.
82%
#503 chore(merge): merge 'main' back into 'feature/12f' rockcraft merged Merged main into feature/12f to synchronize branches. Approved by one reviewer, passed CI checks, and successfully merged by external contributor gregory-schiano.
82%
#1172 chore(merge): main into feature/pro-sources rockcraft merged Merged main into feature/pro-sources after resolving conflicts and integrating documentation and workflow fixes. Approved by two reviewers and passed CI checks.
80%
#4581 chore(merge): 'main' into 'feature/components' snapcraft merged Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files.
80%
#1159 chore(merge): main into feature/pro-sources rockcraft merged Merged main into feature/pro-sources. The merge intentionally leaves the build broken due to stale dependency references, which a follow-up PR will resolve. Approved by two reviewers.
80%
#1475 chore(merge): main into feature/pro-sources craft-parts merged Merged main into feature/pro-sources following two approvals. The maintainer anticipated CI failures and scheduled a separate cleanup PR. The branch was merged as a preparatory step despite failing edge-case tests.
80%
#1050 chore(merge): feature/pro-sources into main craft-application merged Merged feature/pro-sources into main, resolving CRAFT-5016. Approved by two reviewers and passed CI checks. Adds 1554 lines across 19 files.
80%
#412 chore: merge origin/main rockcraft merged Merged origin/main into feature/12f. Resolved conflicts and applied manual updates to align with upstream refactorings and updated base notation. Approved by three reviewers and passed CI checks.
79%
#1031 chore(merge): main into feature/pro-sources craft-application merged Merged main into the stale feature/pro-sources branch via a manual merge due to prior squash merges and outdated base. CI failures were expected and accepted. Approved and merged to enable upcoming cleanup and final integration.
79%
#1184 chore(merge): feature/pro-sources into main rockcraft merged Squash merged feature/pro-sources into main following two reviewer approvals and successful CI checks. The commit updated 36 files with 578 additions and 26 deletions.
79%