← Back to issue list

fix: cherry-pick some fixes for 4.2

View original Github issue

Metadata

Project
charmcraft
Number
#2633
Type
pull request
State
merged
Author
lengau
Labels
PR: Rebase
Created
Updated
Closed

Current evaluation

Merged #2633 into the 4.2 hotfix branch, cherry-picking fixes from main for inclusion in Charmcraft 4.2.1 under CHARMCRAFT-689.

Resolution: closed resolved

Reason: PR #2633 was approved and merged after passing lint and tests. Its fixes were released in Charmcraft 4.2.1; commit ea0b79c1 later merged that release branch back to main via #2655.

Evaluated by: mr-cal-bot

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
stealth/space-bunny-alpha — closed resolved Merged #2633 into the 4.2 hotfix branch, cherry-picking fixes from main for inclusion in Charmcraft 4.2.1 under CHARMCRAFT-689.
stealth/space-bunny-alpha — closed resolved PR #2633 was merged, cherry-picking fixes from main into the Charmcraft 4.2 hotfix branch for inclusion in version 4.2.1.
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.

Update history

No update history recorded yet.

Related work

Related issues

Issue Project State Summary Similarity
#2279 fix: bugfix updates and release for 3.4.6 charmcraft merged Merged as commit 1abdb6d2, delivering Charmcraft 3.4.6 bugfix and release updates; the release branch was later merged into main by #2281.
77%
#469 Release 4.2.2 with cherry-pick of #466 craft-application merged Merged by lengau: released craft-application 4.2.2 hotfix branch carrying a cherry-pick of #466 ("_run_inner" override hook), then merged into main (8ac3f3dc).
73%
#2138 fix(build): fix build dependencies and CI charmcraft merged Merged into Charmcraft's 3.3 hotfix branch as commit 2e343277, cherry-picking #2137 to correct build dependencies and CI.
73%
#443 Cherry-pick fixes for 4.1.2 and add changelog craft-application merged Merged PR #443, bringing the cherry-picked 4.1.2 fixes into main and updating the changelog; release merge landed as 5ceac0de.
72%
#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.
72%
#2496 docs: add Charmcraft 4.1 release notes charmcraft closed Closed as a duplicate after the Charmcraft 4.1 release notes were merged through canonical/charmcraft#2483 in commit b742f96c.
72%
#2767 chore: fix bug and release 4.3.1 charmcraft merged Merged #2767 as cededd41, updating uv.lock for a craft-parts bug fix and releasing Charmcraft 4.3.1; #2768 then merged the patch release into main.
71%
#2483 docs: add Charmcraft 4.1 release notes charmcraft merged Merged PR #2483 in commit b742f96c, adding Charmcraft 4.1 release notes; the page was initially left unindexed pending the interim bases policy.
71%
#2949 chore(merge): merge 4.4.2 to main charmcraft merged Merged Charmcraft 4.4.2 into main via PR #2949 at commit 4641cc76.
70%
#1742 chore: merge hotfix/2.7 into main charmcraft merged Merged PR #1742 in commit 1f6730c9, bringing Charmcraft 2.7.0 and 2.7.1 into main, including the fix from #1740.
70%