chore: merge origin/main
Metadata
Current evaluation
Merged main into feature/12f, rebasing 12-factor work on recent refactorings and switching base notation to ubuntu@22.04 (128 files, +2406/-3031); approved by 3 reviewers.
Resolution: closed resolved
Reason: The PR itself was merged into the target feature/12f branch after maintainer approval by 3 reviewers with no unresolved comments; its final commit manually ported the 12-factor work onto the main-branch refactorings, including the ubuntu@22.04 base notation change.
Evaluated by: mr-cal-bot
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 |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/12f, rebasing 12-factor work on recent refactorings and switching base notation to ubuntu@22.04 (128 files, +2406/-3031); approved by 3 reviewers. | |
| stealth/space-bunny-alpha | — | closed superseded | canonical/charmcraft#1480 was closed unmerged and superseded by #1547, which merged main into feature/12f and updated the 12-factor branch. | |
| 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. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/rockcraft#454
(confidence 70%)
Earlier merged '12f merge' PR synchronising main into the 12-factor branch (123 files, +2011/-1422).
-
Duplicate Of:
charmcraft#1547
(confidence 55%)
The sister charmcraft 'merge main into feature/12f' PR; charmcraft#1480 was closed unmerged as superseded by #1547, which is the equivalent merge done as one reviewable commit.
-
Related To:
canonical/rockcraft#493
(confidence 50%)
A later attempt at merging main into feature/12f that was closed unmerged after going stale.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #798 chore: merge main into 2.0 feature branch | craft-parts | merged | Merged main into the feature/2.0 branch via commit d866f133 (branch work/main-to-2.0) to clear CI failures. Approved by 2 reviewers; 40 files changed, +203/-125. Merge-only chore PR. | |
| #468 chore: merge main into feature/12f | rockcraft | merged | Merged PR #468 synchronized feature/12f with main; the author confirmed the branch update on 2024-02-12. | |
| #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). | |
| #1547 chore: merge main into feature/12f | charmcraft | merged | Merged main into feature/12f as a single merge commit (+9828/-2082) to refresh the branch and keep the snapstore channel open; approved by 2 reviewers. macOS extension test timeouts were flagged but deemed non-blocking. | |
| #211 chore(merge): merge/starbase into main | craft-grammar | merged | Merged starbase into main via #211 (commit b95cc0d), changing 33 files (+719/-837); all CI checks passed and two reviewers approved. | |
| #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. | |
| #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. | |
| #1490 chore: Merge main back into feature/12f branch | charmcraft | closed | Closed unmerged as difficult to review; canonical/charmcraft#1547 superseded it with a single reviewable merge of main into feature/12f and was merged. | |
| #614 chore: merge branch 'main' into 'feature/2.0' | craft-providers | merged | Merged main into feature/2.0 as a branch-sync update in commit 87435d0 after maintainer approval. |