chore(merge): main into feature/pro-sources
Metadata
Current evaluation
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.
Suggested action: —
No scores available.
Issue body
- [x] Have you followed the guidelines for contributing?
- [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)?
- [ ] Have you successfully run `make lint && make test`?
- [ ] Have you added an entry to the changelog (`docs/reference/changelog.rst`)?
---
The feature branch was stale and based on craft-app v4. Main had been squash-merged twice already, so this merge was very messy and manual. The CI is expected to fail too.
Similar to https://github.com/canonical/craft-providers/pull/913 and https://github.com/canonical/craft-parts/pull/1475, there isn't much value in reviewing this PR. The important PRs are upcoming, one to clean up this branch and another to merge to main.
(CRAFT-5016)
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the stale feature/pro-sources branch via a manual, messy merge due to outdated craft-app v4 dependencies. CI was expected to fail. Upcoming cleanup and final merge to main will follow. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into the stale feature/pro-sources branch manually due to prior squash merges. CI failures were expected. Review was skipped, with branch cleanup and final integration to main deferred to subsequent PRs. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #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. | |
| #798 chore: merge main into 2.0 feature branch | craft-parts | merged | Merged to resolve CI failures by integrating main into the 2.0 feature branch. Approved by two reviewers with passing checks. The maintainer synchronized the branches to restore continuous integration. | |
| #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. | |
| #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. | |
| #4579 chore(merge): 'main' into 'feature/components' | snapcraft | closed | Merged main into feature/components to resolve issue #4576. The pull request was closed following the integration. |