chore: merge 3.5.2 to main
Metadata
Current evaluation
Merged Charmcraft 3.5.2 from the 3.5 branch into main via #2359 (commit 0555ad54), retaining the deletion of the bundle.yaml reference.
Resolution: closed resolved
Reason: PR #2359 was merged as commit 0555ad54 after two approvals, bringing the 3.5.2 changes into main. The sole merge conflict was resolved by keeping the bundle.yaml reference deleted.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This merges everything from the 3.5 branch to main. The only merge conflict was the deletion of the reference about `bundle.yaml`, which I have kept deleted on main. All other changes come directly from PRs.
Failing tests are known-bad/flaky tests.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged Charmcraft 3.5.2 from the 3.5 branch into main via #2359 (commit 0555ad54), retaining the deletion of the bundle.yaml reference. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged Charmcraft 3.5.2 into main via #2359 (commit 0555ad54), retaining deletion of the bundle.yaml reference; failing suites were identified as known-bad or flaky. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged 3.5.2 into main in canonical/charmcraft#2359 (commit 0555ad54), preserving deletion of the bundle.yaml reference; failing CI suites were documented as known-bad or flaky. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged Charmcraft 3.5.2 into main via #2359, keeping the bundle.yaml reference deleted; all other changes came from existing PRs. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged Charmcraft 3.5.2 into main via PR #2359, keeping the deleted bundle.yaml reference removed after the sole merge conflict. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged the 3.5.2 branch into main via commit 0555ad54 (PR #2359), keeping the obsolete bundle.yaml reference deleted; remaining failures were known flaky tests. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged the 3.5 branch into main, preserving the deletion of the bundle.yaml reference. All other changes originated from existing PRs; three CI suites failed, but were identified as known-bad or flaky. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged branch 3.5.2 into main, resolving a conflict over the deleted bundle.yaml reference. All other changes came from existing PRs. Approved by two reviewers, CI passed except for known flaky tests. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged the 3.5.2 branch into main, resolving a single merge conflict by retaining the deletion of the bundle.yaml reference. All other changes originated from existing PRs. Failing tests are acknowledged as known or flaky. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #2161 chore: merge 3.4.3 to main | charmcraft | merged | Merged Charmcraft 3.4.3 into main via approved PR #2161 at commit d3790ac6. | |
| #2317 chore: merge 3.5.1 to main | charmcraft | merged | Merged into main as ca852967, bringing the Charmcraft 3.5.1 build fix into main. | |
| #1798 chore: merge 3.1.2 to main | charmcraft | merged | Merged Charmcraft 3.1.2 into main via #1798, forward-merging fixes released on 2024-08-07; landed as commit fba5bdd0. | |
| #1436 chore: merge 2.5.3 to main | charmcraft | merged | Merged Charmcraft 2.5.3 into main via PR #1436 at commit 3c9e29b0, integrating release updates across four files after two approvals. | |
| #2147 chore: merge 3.3.3 to main | charmcraft | merged | Merged Charmcraft 3.3.3 into main via PR #2147 at commit 1cf835a4, integrating the hotfix release branch after approval. | |
| #2281 chore(merge): merge 3.4.6 to main | charmcraft | merged | Merged Charmcraft 3.4.6 into main via commit f41a9fe6, bringing the bugfix release prepared in #2279 onto the main branch. | |
| #2121 chore(release): merge 3.3.2 to main | charmcraft | merged | Merged charmcraft 3.3.2 bugfixes from the 3.3 branch into main in PR #2121 (commit 07603035). | |
| #2330 chore: merge 3.5.1 to main | charmcraft | merged | Merged Charmcraft 3.5.1 into main via #2330 (commit cf40338e); two Ubuntu snap-test suites failed, but approval allowed the PR to merge. | |
| #1430 chore: merge 2.5.3 to main | charmcraft | closed | Closed unmerged and superseded by #1436, which merged Charmcraft 2.5.3 into main in commit 3c9e29b0. | |
| #2655 chore: merge 4.2.1 to main | charmcraft | merged | Merged the Charmcraft 4.2.1 maintenance branch into main via #2655 at commit ea0b79c1, including patch fixes #2644 and #2646. |