chore(merge): merge hotfix/1.21 back to main
Metadata
Current evaluation
Merged hotfix/1.21 branch back into main to propagate recent fixes to the development branch.
Resolution: closed resolved
Reason: The PR was merged by maintainer tigarmo after passing all CI checks, updating 2 files with +5/-5 lines.
Evaluated by: mr-cal-bot
No scores available.
Issue body
---
- [ ] I've followed the [contribution guidelines](https://github.com/canonical/rockcraft/blob/main/CONTRIBUTING.md).
- [ ] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/).
- [ ] I've successfully run `make lint && make test`.
- [ ] I've added or updated any relevant documentation.
- [ ] In documents I changed, I [added a meta description](https://canonical-starflow.readthedocs-hosted.com/how-to/add-a-page-meta-description/) if one was missing.
- [ ] I've updated the relevant release notes.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| qwen/qwen3.6-35b-a3b | — | closed resolved | Merged hotfix/1.21 branch back into main to propagate recent fixes to the development branch. |
Update history
| Date | Change |
|---|---|
| merged | |
| updated | |
| updated | |
| created |
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #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. | |
| #511 chore(merge): merge 'hotfix/1.2' back into 'main' | rockcraft | merged | Merged hotfix/1.2 back into main via PR #511 (commit 0ef121f3), bringing the 1.2 maintenance fixes forward with two approvals. | |
| #1392 chore(merge): merge hotfix/1.21 back into main | rockcraft | closed | Merged hotfix/1.21 into main, updating craft-parts to fix the pathlib performance regression. | |
| #491 chore(merge): merge 'hotfix/1.2' back to 'main' | rockcraft | merged | Merged hotfix/1.2 back into main via #491 (commit bd69420e), with two approvals. | |
| #558 chore: merge 'hotfix/1.3' back into 'main' | rockcraft | merged | Merged hotfix/1.3 back into main via PR #558, integrating the maintenance branch into the main line. | |
| #500 chore(merge): merge 'hotfix/1.2' back into 'main' | rockcraft | merged | Merged PR #500 back-merged hotfix/1.2 into main after approval by two reviewers, with no unresolved comments. | |
| #470 chore(merge): merge 'hotfix/1.1' back to main | rockcraft | closed | Back-merge PR of hotfix/1.1 into main was approved by tigarmo but closed with an empty diff (0 files changed), leaving the 1.1 maintenance fixes integrated another way. | |
| #477 chore: merge hotfix/1.19 | craft-providers | merged | Merged hotfix/1.19 into main via commit d7ec90f (PR #478), incorporating the 1.19 maintenance changes. | |
| #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). | |
| #1277 chore(merge): hotfix/1.19 to main | rockcraft | merged | Merged hotfix/1.19 into main via #1277, bringing the 1.19.2 maintenance changes, including release notes from #1275, into the main line. |