← Back to issue list

chore(merge): feature/dotnet into main

View original Github issue

Metadata

Project
snapcraft
Number
#5569
Type
pull request
State
merged
Author
mr-cal
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged feature/dotnet into main in commit 6f88f58db (#5569) after approval and required CI checks passed; prerequisite #5570 had merged.

Resolution: closed resolved

Reason: PR #5569 was approved and merged into main as commit 6f88f58db. Its blocker, PR #5570, merged the craft-parts 2.14.0 update in commit 52bbbc849 and unblocked the merge.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the [guidelines for contributing](https://github.com/canonical/snapcraft/blob/main/CONTRIBUTING.md)? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `make lint`? - [x] Have you successfully run `make test`? --- Merges `feature/dotnet` into `main`. Blocked by #5570.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged feature/dotnet into main in commit 6f88f58db (#5569) after approval and required CI checks passed; prerequisite #5570 had merged.
stealth/space-bunny-alpha — closed resolved Merged feature/dotnet into main via PR #5569 (commit 6f88f58db) after craft-parts 2.14.0 landed through blocking PR #5570.
stealth/space-bunny-alpha — closed resolved Merged feature/dotnet into main after approval by two reviewers, with 45 additions and 46 deletions across nine files. The required CI checks passed; the only failure was OSV-scanner.
qwen/qwen3.6-35b-a3b — — Merged the feature/dotnet branch into main after two reviewer approvals and passing CI checks. The update modified nine files with minor changes, finalizing the integration following resolution of prior blocking dependencies.
qwen3.6-35b-a3b-mtp-q6 — — Merged feature/dotnet into main by maintainer mr-cal. The branch was previously blocked by issue #5570. All linting and testing checks passed.

Update history

No update history recorded yet.

Related work

  • Blocked By: canonical/snapcraft#5570 (confidence 100%)

    Merged the required craft-parts 2.14.0 dependency update before allowing #5569 to proceed.

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).
84%
#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.
83%
#614 chore: merge branch 'main' into 'feature/2.0' craft-providers merged Merged main into feature/2.0 as a branch-sync update in commit 87435d0 after maintainer approval.
83%
#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.
83%
#1184 chore(merge): feature/pro-sources into main rockcraft merged Squash-merged feature/pro-sources into main as commit 1987d98b, changing 36 files; all reported CI checks passed and the PR received two approvals.
82%
#4581 chore(merge): 'main' into 'feature/components' snapcraft merged Merged PR #4581 brought main into feature/components, updating the components snap with core24 support in revision 10646 and fixing #4576.
82%
#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.
82%
#4579 chore(merge): 'main' into 'feature/components' snapcraft closed PR #4579 merged main into feature/components, bringing the core24 provider fix into the components build; components snap revision 10646 was verified for #4576.
82%
#1040 chore(merge): 2.4.3 into main craft-parts merged Merged version 2.4.3 into main via PR #1040, landing as commit fab7fa92 after two reviewer approvals.
82%
#1223 chore(merge): 2.20.1 into main craft-parts merged Merged the 2.20.1 release branch into main via PR #1223 (commit 30ea3701); all reported CI checks passed.
82%