← Back to issue list

chore(merge): feature/pro-sources into main

View original Github issue

Metadata

Project
rockcraft
Number
#1184
Type
pull request
State
merged
Author
tigarmo
Labels
PR: Squash
Created
Updated
Closed

Current evaluation

Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals.

Resolution: closed resolved

Reason: PR canonical/rockcraft#1184 was approved and merged into main. The squash commit is 1987d98b, and all reported CI checks passed.

Evaluated by: mr-cal-bot

No scores available.

Issue body

This is the final merge of the `feature/pro-sources` branch into `main`. --- - [ ] 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 Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals.
stealth/space-bunny-alpha — closed resolved Merged feature/pro-sources into main via squash commit 1987d98b (canonical/rockcraft#1184), changing 36 files; all CI checks passed.
stealth/space-bunny-alpha — closed resolved Squash-merged feature/pro-sources into main as commit 1987d98b (canonical/rockcraft#1184), changing 36 files; all CI checks passed.
qwen/qwen3.6-35b-a3b — — Squash merged feature/pro-sources into main following two reviewer approvals and successful CI checks. The commit updated 36 files with 578 additions and 26 deletions.
qwen3.6-35b-a3b-mtp-q6 — — Squash merged feature/pro-sources into main by maintainer tigarmo. The branch passed lint and test checks, updated documentation, and completed the final integration of pro-sources functionality.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#913 chore(merge): main into feature/pro-sources craft-providers merged Merged main into the long-lived feature/pro-sources branch (commit f7edf3d) after a complex conflict caused by squashed PR #721; lint/test CI failures were accepted and deferred. The branch later landed in main via #918 (b56ff14).
90%
#1159 chore(merge): main into feature/pro-sources rockcraft merged Merged main into feature/pro-sources; follow-up #1184 then squash-merged the feature into main as 1987d98b, completing the integration.
90%
#1172 chore(merge): main into feature/pro-sources rockcraft merged Merged main into feature/pro-sources via PR #1172, bringing docs and workflow updates; the feature branch was later merged into main by PR #1184 (1987d98b).
89%
#1031 chore(merge): main into feature/pro-sources craft-application merged Merged main into feature/pro-sources in commit 39ed82ab to resync the stale branch; the Pro sources work later reached main through #1050 (8c1a7aeb).
88%
#918 chore(merge): feature/pro-sources into main craft-providers merged Merged feature/pro-sources into main via #918 (commit b56ff14), completing CRAFT-5012 with all CI checks passing and 1,594 additions across 9 files.
88%
#582 chore: merge main with pro sources craft-application merged Merged main into feature/pro-sources via PR #582 (commit 559ec1e5), resynchronizing the long-lived branch after two approvals.
88%
#1475 chore(merge): main into feature/pro-sources craft-parts merged Merged main into feature/pro-sources to synchronize the branch; expected CI failures were deferred, while the pro-sources feature later landed in #1483 (bedb4c0f).
88%
#503 chore(merge): merge 'main' back into 'feature/12f' rockcraft merged Merged PR #503 after approval, synchronizing main into feature/12f with 183 additions and 21 deletions across 20 files.
85%
#798 chore: merge main into 2.0 feature branch craft-parts merged Merged main into the feature/2.0 branch via commit d866f133 (branch work/main-to-2.0) to clear CI failures. Approved by 2 reviewers; 40 files changed, +203/-125. Merge-only chore PR.
85%
#1050 chore(merge): feature/pro-sources into main craft-application merged Pro sources support was merged into main by PR #1050 (commit 8c1a7aeb), resolving CRAFT-5016.
84%