fix: cherry-pick some fixes for 4.2
Metadata
Current evaluation
Merged cherry-picked fixes from main into the 4.2 hotfix branch. Approved by reviewers and passed CI. Changes will be included in the 4.2.1 release.
Suggested action: —
No scores available.
Issue body
This cherry-picks some changes from the main branch to the 4.2 hotfix branch.
These changes will be included in 4.2.1.
CHARMCRAFT-689
---
- [x] I've followed the [contribution guidelines](https://github.com/canonical/charmcraft/blob/main/CONTRIBUTING.md).
- [x] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/).
- [x] I've successfully run `make lint && make test`.
- [x] I've added or updated any relevant documentation.
- [x] I've updated the relevant release notes.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | — | Merged cherry-picked fixes from main into the 4.2 hotfix branch. Approved by reviewers and passed CI. Changes will be included in the 4.2.1 release. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged cherry-picked fixes from main into the 4.2 hotfix branch for inclusion in version 4.2.1. Static analysis warnings were flagged by a bot but marked as non-blocking notifications requiring no action. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged cherry-picked fixes from main to the 4.2 hotfix branch for the 4.2.1 release. CI type-checking warnings were non-blocking notifications and did not prevent the merge. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #443 Cherry-pick fixes for 4.1.2 and add changelog | craft-application | merged | Merged after approval from two reviewers. Contains cherry-picked fixes for version 4.1.2 and a changelog update, modifying six files with 60 additions and 5 deletions. | |
| #2139 fix(hotfix/3.4): fix build dependencies and CI | charmcraft | merged | Merged a cherry-pick of #2137 to the 3.4 hotfix branch to fix build dependencies and CI. Approved by two reviewers with no unresolved comments. Changes modify three files with 51 additions and 13 deletions. | |
| #462 create release 4.2.1 | craft-application | merged | Merged to create release 4.2.1. The pull request cherry-picks changes from version 4.1.3 and adds a changelog entry. Approved by two reviewers and successfully integrated. | |
| #469 Release 4.2.2 with cherry-pick of #466 | craft-application | merged | Merged to release version 4.2.2, incorporating a cherry-pick of PR #466. Approved by two reviewers with zero unresolved comments. Changes affected two files, adding 61 lines and removing 46. | |
| #1088 Fix and changelog for 2.4.4 | craft-parts | merged | Merged backport of fix #1086 to the 2.4 branch for Charmcraft 3.4. Includes a changelog update. Approved by three reviewers and passed CI checks. Maintainer noted future cherry-picks from main may be needed. |