chore: merge main into feature/12f
Metadata
Current evaluation
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.
Resolution: closed resolved
Reason: The PR itself was merged into feature/12f after @lengau approved it (2024-02-27), following the author's re-creation of it with a single merge commit and re-adding the missing apply_extensions fix. Reviewer confirmed macOS test timeouts were 'not going to block that for this merge'.
Evaluated by: mr-cal-bot
Issue body
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | 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. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged main into feature/12f to update the branch and keep the Snap Store channel open. Approved after a corrected single-merge commit; macOS test timeouts were non-blocking. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged main into feature/12f to keep the branch updated and maintain the snapstore channel. Approved by two reviewers following a corrected merge commit. macOS test timeouts were noted but did not block the merge. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged to synchronize the feature/12f branch with main and maintain the snapstore channel. Approved despite macOS test timeouts after restructuring commits and applying minor fixes. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/charmcraft#1582
(confidence 40%)
Commit c060832a 'Add the flask-framework extension' landed shortly after, referencing the 12f extension work in the same branch lineage.
-
Related To:
canonical/charmcraft#2884
(confidence 30%)
Commit 0712d308 'fix(extensions): align 12-factor V2 contract' is the downstream extension apply_extensions work referenced in the review comments.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #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. | |
| #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. | |
| #494 chore: Merge main into Feature/12f | rockcraft | merged | Merged PR #494 synchronized feature/12f with main to keep the edge/12f channel open; the noted 24.04 spread failures were unrelated. | |
| #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). | |
| #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. | |
| #412 chore: merge origin/main | rockcraft | merged | 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. | |
| #1584 chore(merge): feature/ca-2 into main | charmcraft | closed | feature/ca-2 was merged into main via #1584, completing the branch integration and closing the pull request. | |
| #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. | |
| #1595 chore: Merge main back to feature/12f | charmcraft | closed | Closed unmerged after reviewers rejected the PR's excessive history and requested a replacement containing only the merge commit; no resolving commit was recorded. |