chore(merge): main into feature/pro-sources
Metadata
Current evaluation
Merged main into feature/pro-sources in commit 39ed82ab to resync the stale branch; the Pro sources work later reached main through #1050 (8c1a7aeb).
Resolution: closed resolved
Reason: PR #1031 was merged as commit 39ed82ab, completing the intended main-to-feature branch synchronization. The feature branch was subsequently merged into main by PR #1050 at commit 8c1a7aeb.
Evaluated by: mr-cal-bot
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 |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/pro-sources in commit 39ed82ab to resync the stale branch; the Pro sources work later reached main through #1050 (8c1a7aeb). | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/pro-sources in #913 (f7edf3d); the feature branch was subsequently merged into main by #918 (b56ff14). | |
| 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. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/craft-application#1050
(confidence 100%)
Merged feature/pro-sources into main as commit 8c1a7aeb, delivering the branch synchronization work downstream.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1475 chore(merge): main into feature/pro-sources | craft-parts | merged | 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). | |
| #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. | |
| #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. | |
| #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. |