← Back to issue list

chore(merge): hotfix/1.17 into main

View original Github issue

Metadata

Project
rockcraft
Number
#1120
Type
pull request
State
closed
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

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.

Resolution: closed superseded

Reason: #1120 was abandoned after build, snap-build, and fast-test checks failed. PR #1121 superseded it by successfully performing the same merge in 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 superseded 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.
stealth/space-bunny-alpha — closed superseded Merge PR #1120 was abandoned after CI failures; replacement PR #1121 merged hotfix/1.17 into main via commits a90fcd1c and cf1659f8.
stealth/space-bunny-alpha — closed superseded Closed after CI failures; its hotfix/1.17-to-main merge was superseded by merged PR #1121 (commits a90fcd1c/cf1659f8).
stealth/space-bunny-alpha — closed superseded Merge of hotfix/1.17 into main was closed unmerged after snap-build and fast-test CI failures; a follow-up PR #1121 performed the same merge successfully (merge commits a90fcd1c, cf1659f8).
stealth/space-bunny-alpha — closed superseded Closed after hotfix/1.17 merge PR #1120 was abandoned due to CI failures; PR #1121 successfully repeated the merge into main.
qwen/qwen3.6-35b-a3b — — Merging hotfix/1.17 into main was closed without completion. Failing CI checks for snap-build, build, and fast tests resulted in abandonment.
qwen3.6-35b-a3b-mtp-q6 — — Merged hotfix/1.17 into main. The maintainer closed the pull request following routine branch integration without additional comments or required changes.

Update history

No update history recorded yet.

Related work

  • Superseded By: canonical/rockcraft#1121 (confidence 99%)

    Follow-up PR repeated the abandoned hotfix/1.17 merge into main and was merged.

Related issues

Issue Project State Summary Similarity
#1121 chore(merge): hotfix/1.17 into main rockcraft merged Merged hotfix/1.17 into main via #1121; history records merge commits a90fcd1c and cf1659f8 after two approvals.
94%
#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%
#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).
90%
#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%
#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.
89%
#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.
89%
#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.
88%
#831 chore(merge): 'hotfix/5.6' into 'main' craft-application closed Closed as superseded by #832, which merged hotfix/5.6 into main at commit 8c644216 after all CI checks passed.
88%
#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.
88%
#832 chore(merge): 'hotfix/5.6' into 'main' craft-application merged Merged hotfix/5.6 into main via #832 at commit 8c644216; two reviewers approved and all CI checks passed.
88%