chore(merge): hotfix/1.17 into main
Metadata
Current evaluation
Merged hotfix/1.17 into main via #1121; history records merge commits a90fcd1c and cf1659f8 after two approvals.
Resolution: closed resolved
Reason: PR #1121 was approved by two maintainers and merged into main. Repository history contains matching hotfix merge commits a90fcd1c and cf1659f8.
Evaluated by: mr-cal-bot
No scores available.
Issue body
<!-- Describe your changes -->
---
- [ ] 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.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | Merged hotfix/1.17 into main via #1121; history records merge commits a90fcd1c and cf1659f8 after two approvals. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged hotfix/1.17 into main, bringing the 1.17 maintenance fixes forward via merge commits a90fcd1c and cf1659f8. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged hotfix/1.17 into main via a90fcd1c/cf1659f8, adding 11 lines across two files and receiving two approvals. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged hotfix/1.17 into main through PR #1121 (commits a90fcd1c and cf1659f8), with two approvals. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged hotfix/1.17 into main with two approvals, adding 11 lines across two files. Matching merge commits are recorded as a90fcd1c and cf1659f8. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged the hotfix/1.17 branch into main after approval from two reviewers and passing CI checks. The pull request successfully integrated the hotfix updates into the main branch. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged hotfix/1.17 into main by maintainer tigarmo. The branch integration passed standard checks and was applied without conflicts or additional review comments. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/rockcraft#1116
(confidence 80%)
Its d79fbd75 Gradle/jdeps spread-test fix appears in the hotfix lineage preceding this merge.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #1120 chore(merge): hotfix/1.17 into main | rockcraft | closed | Merge PR #1120 was closed after CI failures; follow-up #1121 repeated the hotfix/1.17-to-main merge and was merged in commits a90fcd1c/cf1659f8. | |
| #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. | |
| #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. | |
| #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). | |
| #563 chore(merge): 'hotfix/1.3' into 'main' | rockcraft | merged | Merged hotfix/1.3 into main in commit 5200e42, with no net file changes; the PR received two approvals. | |
| #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). | |
| #478 chore: merge hotfix/1.19 | craft-providers | merged | Merged hotfix/1.19 into main as the corrected second attempt after #477 was reverted; landed in commit d7ec90f. | |
| #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. | |
| #1394 chore(merge): merge hotfix/1.21 back to main | rockcraft | merged | Merged hotfix/1.21 branch back into main to propagate recent fixes to the development branch. | |
| #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. |