← Back to issue list

chore: merge 3.5.2 to main

View original Github issue

Metadata

Project
charmcraft
Number
#2359
Type
pull request
State
merged
Author
lengau
Labels
Created
Updated
Closed

Current evaluation

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.

Suggested action:

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
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.
qwen3.6-35b-a3b-mtp-q6 Merged the 3.5.2 branch into main. Resolved a single merge conflict by retaining the deletion of the bundle.yaml reference. All other changes were carried over from existing PRs. Failing tests are known or flaky.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#1798 chore: merge 3.1.2 to main charmcraft merged Merged release 3.1.2 into the main branch. Approved by two reviewers and passed CI checks. Updated 10 files with 227 additions and 57 deletions.
90%
#2147 chore: merge 3.3.3 to main charmcraft merged Merged version 3.3.3 into the main branch. Approved by two reviewers and passing CI, the change updates three files with 43 additions and 3 deletions.
90%
#1965 chore: merge 3.2.2 to main charmcraft merged Successfully merged maintainer chore PR to integrate version 3.2.2 into main. Approved by two reviewers with a single-file, seven-line update. Completed without CI failures.
89%
#2148 chore: merge 3.4.1 to main charmcraft merged Merged version 3.4.1 into the main branch. Approved by two reviewers and passed CI checks, the change modified three files with 70 additions and 59 deletions.
89%
#2415 chore: merge 3.5.3 to main charmcraft merged Merged to main to incorporate the 3.5.3 hotfix release history. Approved by two reviewers with 179 additions and 15 deletions across 11 files. Several CI tests failed but were unrelated to the changes.
89%
#2330 chore: merge 3.5.1 to main charmcraft merged Merged to main by maintainer lengau. Integrates version 3.5.1 into main. Approved by one reviewer. CI passed most checks despite failing Ubuntu 20.04 and 22.04 snap tests. Changes affect two files.
89%
#2153 chore: merge 3.4.2 to main charmcraft merged Merged maintainer lengau's chore to integrate version 3.4.2 into main. Approved by three reviewers with minimal changes (+6/-1 across two files). Successfully completed without CI failures or blockers.
88%
#1436 chore: merge 2.5.3 to main charmcraft merged Merged into main following two reviewer approvals. Integrates version 2.5.3 updates across four files, adding 32 lines and removing 11.
88%
#2161 chore: merge 3.4.3 to main charmcraft merged Merged into main following approval by two reviewers and passing CI checks. The change integrates version 3.4.3 into the main branch, modifying two files with minor adjustments.
88%
#1030 chore(merge): 2.4.2 into main craft-parts merged Merged release branch 2.4.2 into main. Update only modified the changelog as all code changes were already present on main. Approved by two reviewers and passed CI.
88%