← Back to issue list

chore(merge): 'main' into 'feature/components'

View original Github issue

Metadata

Project
snapcraft
Number
#4581
Type
pull request
State
merged
Author
mr-cal
Labels
—
Created
Updated
Closed

Current evaluation

Merged PR #4581 brought main into feature/components, updating the components snap with core24 support in revision 10646 and fixing #4576.

Resolution: closed resolved

Reason: PR #4581 was approved and merged, explicitly stating that it fixes #4576. The reporter subsequently verified the components snap's core24 update in revision 10646.

Evaluated by: mr-cal-bot

No scores available.

Issue body

- [x] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [x] Have you successfully run `tox run -m lint`? - [x] Have you successfully run `tox run -e test-py310`? (supported versions: `py39`, `py310`, `py311`, `py312`) ----- Merge `main` into `feature/components`. Fixes #4576

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged PR #4581 brought main into feature/components, updating the components snap with core24 support in revision 10646 and fixing #4576.
stealth/space-bunny-alpha — closed resolved Merged PR #4581 by mr-cal merged main into feature/components (91 files, +2288/-514), resolving edge/components out-of-date report #4576; components snap rebuilt with core24 support.
stealth/space-bunny-alpha — closed resolved Merged PR #4581 updated feature/components from main and explicitly fixed snapcraft#4576; the 91-file merge was approved and retained test coverage.
stealth/space-bunny-alpha — closed resolved Merged PR #4581 updated feature/components with main, including the core24 provider mapping needed to resolve #4576. It was approved with no unresolved review comments.
qwen/qwen3.6-35b-a3b — — Merged main into feature/components, resolving #4576. Approved by a reviewer, passed CI, and maintained full test coverage across 91 files.
qwen3.6-35b-a3b-mtp-q6 — — Merged main into feature/components to resolve issue #4576. Branch passed lint, test, and Codecov checks before integration by maintainer mr-cal.

Update history

No update history recorded yet.

Related work

  • Related To: canonical/snapcraft#4576 (confidence 100%)

    The reported outdated edge/components snap was updated and verified.

Related issues

Issue Project State Summary Similarity
#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.
95%
#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.
87%
#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).
85%
#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%
#4782 chore(merge): '8.2.3' into 'main' snapcraft closed Snapcraft 8.2.3 was synchronized into main by approved zero-diff PR #4782, incorporating core24 fixes from #4770 and #4771.
83%
#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.
83%
#4759 chore(merge): '8.2.1' into 'main' snapcraft closed Snapcraft 8.2.1 was merged into main by replacement PR #4760 at commit 07b4ee15c; #4759 closed without completing the merge.
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.
82%
#5569 chore(merge): feature/dotnet into main snapcraft merged Merged feature/dotnet into main in commit 6f88f58db (#5569) after approval and required CI checks passed; prerequisite #5570 had merged.
82%
#4803 chore(merge): '8.2.7' into 'main' snapcraft merged Merged Snapcraft 8.2.7 into main via approved PR #4803 at commit 1d873e817; 21 files changed (+475/-20).
82%