chore: merge origin/main
Metadata
Current evaluation
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.
Suggested action: —
No scores available.
Issue body
This PR brings in the latest changes from `origin/main`. It's a huge changeset because a lot of refactoring happened after this feature branch got created, but the only changes relevant to the PR itself are the last two commits:
- The second-to-last commit is the merge one; a few conflicts but nothing special about the resolution.
- The very last commit has the changes that I had to do "manually" to bring 12f up-to-date with the refactorings. In my opinion that's the only thing that deserves a more thorough review.
Note that, aligning with `latest/stable` rockcraft, this merge brings in things like the updated base notation (`ubuntu@22.04` instead of `ubuntu:22.04`). This is a necessary step to keep `feature/12f` up-to-date with `main`, but is a considerable change so "heads-up".
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged origin/main into feature/12f. Conflicts resolved and manual updates applied to align with recent refactoring and updated base notation. Maintainer confirmed merge as necessary synchronization. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged origin/main into feature/12f. Resolved merge conflicts and applied manual updates to align with main refactorings. Updated base notation to match latest/stable rockcraft standards. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #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. | |
| #4549 chore(merge): rebase on origin/main | snapcraft | merged | Merged after rebasing feature/craft-application onto origin/main. Approved by two reviewers, title corrected, and tests passed. Completes the first step of the planned branch integration sequence. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #848 chore(merge): 'merge-1.33.1' into 'main' | craft-parts | merged | Merged into main following approval by two reviewers and passing CI checks. The change integrates the merge-1.33.1 branch, updating three files with a +30/-24 line diff. No comments or failures were recorded. |