Merge `rockcraft`
Metadata
Current evaluation
PR #372 merged into the temporary 2.x branch, adding reviewed rockcraft work and commit ccfe498d's corrected craft-cli/craft-parts constraints for the planned 2.9.0 release.
Resolution: closed resolved
Reason: Approved PR #372 was merged into the temporary 2.x branch. It integrated the reviewed rockcraft changes and commit ccfe498d, which corrected dependency version constraints ahead of the 2.9.0 release.
Evaluated by: mr-cal-bot
No scores available.
Issue body
This PR has the work that we did (and reviewed) on the `rockcraft` branch, plus the latest commit that fixes the versions constraints for craft-cli and craft-parts.
Note: This is targeting the temporary `2.x` branch because the `rockcraft` branch originally started off of `2.8.0`, and the other changes in `main` are breaking ones. So the idea is to release a `2.9.0` off of `2.x`, merge `2.x` to `main` and delete it.
Evaluation history
| Date | Model | Scores | Action | Summary |
|---|---|---|---|---|
| stealth/space-bunny-alpha | — | closed resolved | PR #372 merged into the temporary 2.x branch, adding reviewed rockcraft work and commit ccfe498d's corrected craft-cli/craft-parts constraints for the planned 2.9.0 release. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #372 into temporary 2.x, integrating reviewed rockcraft work and corrected craft-cli/craft-parts version constraints for the planned 2.9.0 release. | |
| stealth/space-bunny-alpha | — | closed resolved | Merged PR #372 into temporary 2.x, integrating reviewed rockcraft work and corrected craft-cli/craft-parts version constraints for the 2.9.0 release path. | |
| qwen/qwen3.6-35b-a3b | — | — | Merged into the temporary 2.x branch after two approvals and passing CI. Resolves craft-cli and craft-parts version constraints to enable the 2.9.0 release, with plans to subsequently merge 2.x to main and delete the branch. |
Update history
No update history recorded yet.
Related work
-
Related To:
canonical/rockcraft#354
(confidence 84%)
Rockcraft's reviewed craft-application pack migration fed into this integration.
-
Related To:
canonical/rockcraft#395
(confidence 78%)
Merged the Rockcraft feature branch into Rockcraft main after this work.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #258 Merge `rockcraft` back into `main` | craft-cli | merged | Merged PR #258 restored the rockcraft branch to main and added the missing Craft CLI 2.6.0 changelog entries. | |
| #590 Merge `rockcraft` back into `main` | craft-providers | merged | Merged the rockcraft branch into main via #590 after individual review, adding 2.6.0 changelog entries across six files; approved by two reviewers. | |
| #767 Merge `rockcraft` back to `main` | craft-parts | merged | Merged PR #767 restored the rockcraft branch to main with reviewed 1.33.0 changelog entries; two reviewers approved it. | |
| #621 Recent merge in craft-cli causes rockcraft build to fail | rockcraft | closed | Merged rockcraft#624 (commit 849cbc30) replaced the missing craft-cli rockcraft-branch requirement with released-version constraints, fixing the build failure. | |
| #369 fix: craft-cli branch ref to main (rockcraft branch merged) | craft-application | closed | PR closed unmerged by author yanksyoon; the craft-cli branch-ref fix was relocated to canonical/rockcraft#622, and the underlying build failure (rockcraft#621) was finally fixed by merged rockcraft#624 (commit 849cbc30). | |
| #6 project: add basic rockcraft.yaml parsing and validation (CRAFT-584) | rockcraft | merged | Merged in rockcraft PR #6 (88c9d529), adding rockcraft.yaml parsing and parts validation, renaming tag to version, and switching output from .oci.tar to .rock. | |
| #454 12f merge | rockcraft | merged | Merged PR canonical/rockcraft#454 into the target branch after maintainer approval, integrating 123 files (+2011/-1422). | |
| #8 project: add rockcraft.yaml load function (CRAFT-586) | rockcraft | merged | Merged PR #8 added a dedicated rockcraft.yaml loader with tests; merge commit 3cf2d6fa contains implementation commit 85981d00. | |
| #17 requirements: update dependencies | rockcraft | merged | Merged canonical/rockcraft#17 via commit 2a9bccc5, updating craft-parts with Go plugin and fuse-overlayfs support. | |
| #32 requirements: update dependencies | rockcraft | merged | Merged in canonical/rockcraft#32 (commit 261961c1), updating dependencies to include the craft-parts symlink fix and resolve the stage-package installation failure in #28. |