← Back to issue list

chore(merge): hotfix/7.2 into main

View original Github issue

Metadata

Project
craft-application
Number
#1177
Type
pull request
State
merged
Author
mr-cal
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged hotfix/7.2 into main in commit 56398be7; fixes were already cherry-picked, and PR #1177 added the 7.2.1 changelog entry.

Resolution: closed resolved

Reason: PR #1177 was merged as commit 56398be7 with required checks passing. As documented in the PR, all hotfixes had already been cherry-picked, leaving only the changelog update.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the guidelines for contributing? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `make lint && make test`? - [x] Have you added an entry to the changelog (`docs/reference/changelog.rst`)? --- All cherry-picked fixes, so this only brings in a changelog entry.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged hotfix/7.2 into main in commit 56398be7; fixes were already cherry-picked, and PR #1177 added the 7.2.1 changelog entry.
stealth/space-bunny-alpha — closed resolved Merged hotfix/7.2 into main via #1177 after two approvals; all fixes were already cherry-picked, so the merge only added a 7.2 changelog entry (+14/-1 in docs/reference/changelog.rst).
stealth/space-bunny-alpha — closed resolved Merged hotfix/7.2 into main via #1177. All fixes were already cherry-picked; the merge added only a changelog entry after two approvals.
stealth/space-bunny-alpha — closed resolved Merged hotfix/7.2 into main via #1177, adding the changelog entry because the fixes had already been cherry-picked.
qwen3.6-35b-a3b-mtp-q6 — — Merged hotfix/7.2 into main after two reviewers approved. The pull request only updates the changelog since all fixes were already cherry-picked. CI passed and the branch was successfully integrated.

Update history

Date Change
updated
updated
created

Related work

  • Likely Fixed By: canonical/craft-application#1174 (confidence 96%)

    The hotfix fixed armv8l-to-armhf platform mapping and was already cherry-picked before this changelog merge.

Related issues

Issue Project State Summary Similarity
#1887 chore: merge 2.7.2 to main charmcraft merged Merged the 2.7.2 hotfix branch into main as commit 13a3e049 (#1887), adding the missing 2.7 changelog entry.
92%
#1903 chore: merge 2.7.3 hotfix to main charmcraft merged Merged the 2.7.3 hotfix into main via #1903 (commit 34b9b3de), adding the missing 2.7 release changelog entry.
92%
#924 chore(merge): hotfix/2.1 into main craft-parts closed Merged hotfix/2.1 into main through PR #924, carrying 10 changed files (+50/-16).
90%
#1520 chore(merge): 2.7.1 into main craft-parts merged Merged 2.7.1 backport into main at d4a04636, adding its changelog entry and tag so hotfix/2.7 could be deleted; no code changes.
90%
#6028 chore(merge): hotfix/8.14 into main snapcraft merged Merged hotfix/8.14 into main via commit e8deb5855, bringing its CI fixes onto main after two approvals.
90%
#5103 chore(merge): 7.5.7 into main snapcraft merged Merged 7.5.7 into main in fa644b44c as a no-op because equivalent fixes already existed on hotfix/8.4.
90%
#5745 chore(merge): hotfix/8.11 into main snapcraft closed Superseded by PR #5747, which merged hotfix/8.11 into main as commit 3005d50aa for the 8.12 release.
90%
#630 chore(merge): 'hotfix/1.5' into 'main' rockcraft merged Merged hotfix/1.5 into main via PR #630 at commit 1a5740ad after two approvals; 4 files changed (+13/-12).
89%
#537 chore(merge): 'hotfix/1.20' into 'main' craft-providers merged Merged hotfix/1.20 into main via commit 0b1d043 (#537), bringing the approved hotfix branch into the main line.
89%
#1620 chore(merge): hotfix/2.33 into main craft-parts merged Merged into main as 4b04d8ff, adding the 2.33.1 changelog entry; the hotfix changes had already been cherry-picked from main.
89%