← Back to issue list

chore: revert "fix: revert project model changes (#5857)"

View original Github issue

Metadata

Project
snapcraft
Number
#5888
Type
pull request
State
closed
Author
bepri
Labels
—
Created
Updated
Closed

Current evaluation

Merged as 063c3c89e, undoing #5857's revert and restoring the project model changes; #5889 then merged hotfix/8.13 into main.

Resolution: closed resolved

Reason: The PR was merged as commit 063c3c89e, directly reverting commit 5b50af9cd from #5857 and restoring the project model changes. Commit 393b4dd51 subsequently merged hotfix/8.13 into main via #5889.

Evaluated by: mr-cal-bot

No scores available.

Issue body

In order to merge `hotfix/8.13` back into main, the project model changes reverted in #5857 need to be un-reverted (rereverted?). This is just `git revert 5b50af9cd80304d185282b146c9975dbbb0d768c` followed by fixing a conflict in the release notes. There shouldn't be any more hotfix releases of 8.13 after this is merged. --- - [x] I've followed the [contribution guidelines](https://github.com/canonical/snapcraft/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`. - [ ] I've added or updated any relevant documentation. - [ ] I've updated the relevant release notes.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged as 063c3c89e, undoing #5857's revert and restoring the project model changes; #5889 then merged hotfix/8.13 into main.
stealth/space-bunny-alpha — closed resolved Merged #5888 as 063c3c89e, restoring project model changes after #5857’s revert; #5889 then merged hotfix/8.13 into main.
qwen/qwen3.6-35b-a3b — — Merged to restore project model changes and integrate the hotfix/8.13 branch into main, resolving a release notes conflict.
qwen3.6-35b-a3b-mtp-q6 — — Merged to restore project model changes and integrate the hotfix/8.13 branch into main. The change un-reverted a previous revert and resolved a release notes conflict, finalizing the 8.13 hotfix cycle.

Update history

No update history recorded yet.

Related work

Related issues

Issue Project State Summary Similarity
#5889 chore(merge): 8.13 into main snapcraft merged Merged (commit 063c3c89e): hotfix/8.13 merged back into main, un-reverting #5857 (5b50af9cd) and cherry-picking 7404c56abd to fix an uv.lock conflict. Restores the project model changes for 8.13; no further 8.13 hotfixes planned.
84%
#5857 fix: revert project model changes snapcraft merged Merged in 5b50af9cd, reverting project-model changes accidentally shipped in 8.13.0 and adding 8.13.1 release notes; the revert was later undone in 063c3c89e.
80%
#557 chore(revert): revert "chore(merge): '1.20.3' into 'main' (#552)" craft-providers merged Merged as 0da3f0e, reverting the accidental squash merge eea1f62 (#552); #558 then merged version 1.20.3 into main correctly.
73%
#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.
72%
#5992 chore(merge): merge/8.13 into hotfix/8.14 snapcraft merged Merged hotfix/8.13 into hotfix/8.14 in dcefcbc72 (#5992), carrying over three previously overlooked, untagged fixes.
71%
#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.
71%
#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.
71%
#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.
71%
#321 chore: merge 'hotfix/2.6' back into 'main' craft-application closed Merged hotfix/2.6 back into main via PR #321 (commit 9ee94b68), with two approvals and no unresolved review comments.
71%
#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).
71%