← Back to issue list

chore(merge): main into feature/pro-sources

View original Github issue

Metadata

Project
craft-providers
Number
#913
Type
pull request
State
merged
Author
mr-cal
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

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).

Resolution: closed resolved

Reason: PR #913 was merged with 2 approvals as commit f7edf3d, resyncing feature/pro-sources with main; @lengau explicitly approved ignoring the lint failures on this long-lived branch. The accumulated Pro work was subsequently merged into main by #918 (b56ff14) with all CI green.

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/)? - [x] Have you successfully run `make lint && make test`? --- Merges `main` into the `feature/pro-sources` branch. I expect CI to fail here, as this is an old branch (it was still using tox). I'll address the linter errors and tests in a separate PR. This wasn't an easy merge to resolve - https://github.com/canonical/craft-providers/pull/721 brought in 6 commits from main and squashed them, which confused git. The best way to review this is `git diff origin/main origin/merge/main` to see only pro-related changes. (CRAFT-5012)

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved 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).
qwen/qwen3.6-35b-a3b — closed resolved Merged main into the feature/pro-sources branch to keep the long-lived feature branch up-to-date. CI lint/test failures were acknowledged and deferred to a separate PR.

Update history

Date Change
created

Related work

  • Related To: canonical/craft-providers#918 (confidence 95%)

    'chore(merge): feature/pro-sources into main' merged as b56ff14 with 2 approvals and all CI passing, landing the resynced branch's work.

  • Related To: canonical/craft-providers#812 (confidence 88%)

    Earlier draft attempt to merge feature/pro-sources into main; closed unmerged as superseded by #918.

  • Caused By: canonical/craft-providers#721 (confidence 82%)

    Cited in the PR body as the source of merge confusion: it squashed 6 commits from main, making the merge difficult to resolve.

  • Related To: canonical/craft-providers#890 (confidence 55%)

    'feat(pro): use Ubuntu Pro guest attachment' (31c4e58) is Pro work carried on the branch that #913 resynced.

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).
94%
#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).
93%
#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).
92%
#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.
91%
#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.
91%
#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.
90%
#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.
89%
#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.
87%
#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.
87%
#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.
86%