chore(merge): main into feature/pro-sources
Metadata
Current evaluation
Merged main into feature/pro-sources to synchronize the branch; expected CI failures were deferred, while the pro-sources feature later landed in #1483 (bedb4c0f).
Resolution: closed resolved
Reason: PR #1475 was merged after approval, completing the requested branch synchronization. Its author explicitly deferred expected CI failures to cleanup; #1483 later merged the feature implementation as bedb4c0f.
Evaluated by: mr-cal-bot
No scores available.
Issue body
- [ ] Have you followed the guidelines for contributing?
- [ ] 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`)?
---
Many CI failures are to be expected. Like https://github.com/canonical/craft-providers/pull/913 I'll be addressing those in a separate cleanup PR.
Personally I don't think it's useful to try to review this; it's as straightforward a merge as I could manage it. The real merge of the feature should come later (in my opinion)
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/pro-sources to synchronize the branch; expected CI failures were deferred, while the pro-sources feature later landed in #1483 (bedb4c0f). | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/pro-sources to resynchronize the branch; expected CI failures were deferred. The host APT sources feature later landed via #1483 (bedb4c0f). | |
| stealth/space-bunny-alpha | — | closed resolved | Merged canonical/craft-parts#1475 to synchronize main into feature/pro-sources. Expected CI failures were deferred to a separate cleanup; the feature’s final merge into main was planned for later. | |
| qwen/qwen3.6-35b-a3b | — | — | 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged main into feature/pro-sources as a routine maintenance step. Expected CI failures will be addressed in a separate cleanup PR, with the actual feature integration planned for a later merge. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/craft-parts#1483
(confidence 95%)
Delivered the pro-sources feature that PR #1475's body said would be merged later; merged as bedb4c0f.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1031 chore(merge): main into feature/pro-sources | craft-application | merged | Merged main into feature/pro-sources in commit 39ed82ab to resync the stale branch; the Pro sources work later reached main through #1050 (8c1a7aeb). | |
| #913 chore(merge): main into feature/pro-sources | craft-providers | merged | Merged main into the long-lived feature/pro-sources branch (commit f7edf3d) after a complex conflict caused by squashed PR #721; lint/test CI failures were accepted and deferred. The branch later landed in main via #918 (b56ff14). | |
| #1172 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources via PR #1172, bringing docs and workflow updates; the feature branch was later merged into main by PR #1184 (1987d98b). | |
| #1159 chore(merge): main into feature/pro-sources | rockcraft | merged | Merged main into feature/pro-sources; follow-up #1184 then squash-merged the feature into main as 1987d98b, completing the integration. | |
| #582 chore: merge main with pro sources | craft-application | merged | Merged main into feature/pro-sources via PR #582 (commit 559ec1e5), resynchronizing the long-lived branch after two approvals. | |
| #704 chore: merge main branch with feature/pro-source branch | craft-providers | merged | Merged main into feature/pro-sources via #704 (commit ad55c78), synchronizing the Pro source branch; the feature branch was later merged into main by #918. | |
| #1050 chore(merge): feature/pro-sources into main | craft-application | merged | Pro sources support was merged into main by PR #1050 (commit 8c1a7aeb), resolving CRAFT-5016. | |
| #1184 chore(merge): feature/pro-sources into main | rockcraft | merged | Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals. | |
| #918 chore(merge): feature/pro-sources into main | craft-providers | merged | Merged feature/pro-sources into main via #918 (commit b56ff14), completing CRAFT-5012 with all CI checks passing and 1,594 additions across 9 files. | |
| #503 chore(merge): merge 'main' back into 'feature/12f' | rockcraft | merged | Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files. |