Merge `rockcraft`
Metadata
Current evaluation
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.
Suggested action: —
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 |
|---|---|---|---|---|
| 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. | |
| qwen3.6-35b-a3b-mtp-q6 | — | — | Merged the rockcraft branch into the temporary 2.x branch, incorporating reviewed work and a craft-cli/craft-parts version fix. Intended for the 2.9.0 release, followed by merging to main and branch deletion. |
Update history
No update history recorded yet.
Related issues
| Issue | Project | State | Summary | Similarity |
|---|---|---|---|---|
| #258 Merge `rockcraft` back into `main` | craft-cli | merged | Merged the rockcraft branch into main following approval from two reviewers. The change adds a missing changelog for version 2.6.0 across six files, with 88 additions and 3 deletions. | |
| #767 Merge `rockcraft` back to `main` | craft-parts | merged | Merged the rockcraft branch into main, incorporating changelog entries for version 1.33.0. Approved by two reviewers with zero unresolved comments. Changes span 8 files, adding 117 lines and removing 18. | |
| #621 Recent merge in craft-cli causes rockcraft build to fail | rockcraft | closed | A craft-cli merge removed the rockcraft branch, causing rockcraft builds to fail. Maintainers acknowledged it as a temporary issue and resolved it, closing the report. | |
| #619 Finalize 1.5.x changes | rockcraft | closed | Closed without explicit resolution. Merging craft-cli, craft-parts, craft-providers, craft-application, and rockcraft into mainline was likely completed via separate releases or abandoned, with no merge details documented. | |
| #395 refactor: merge feature/craft-application | rockcraft | merged | Merged feature/craft-application into main, completing Rockcraft's migration to craft-application 1.0.0. The refactoring modified 99 files, resolved multiple issues, and introduced breaking changes. Approved by two reviewers with passing CI. | |
| #369 fix: craft-cli branch ref to main (rockcraft branch merged) | craft-application | closed | Closed without merging. The author indicated the branch reference fix is being handled in a separate pull request and closed this PR to avoid duplication. | |
| #6 project: add basic rockcraft.yaml parsing and validation (CRAFT-584) | rockcraft | merged | Merged changes adding rockcraft.yaml parsing and validation to halt builds on invalid parts. Renamed the tag field to version and updated the output image suffix to .rock. Approved and passed CI across seven files. | |
| #316 Rebase "rockcraft pack" onto craft-application framework | rockcraft | closed | Merged via PR #354 into a feature branch. The rockcraft pack command was rebased onto the craft-application framework to reduce code duplication across craft tools. | |
| #22 requirements: unpin and update craft-cli | rockcraft | merged | Merged. Updates craft-cli to 0.4 and unpins the dependency. Pauses the emitter during rockcraft re-execution and redirects output streams for cleaner logging. Approved by one reviewer, passed CI, and modified 12 files. | |
| #84 Add chisel to rockcraft | rockcraft | merged | Merged after approval and passing CI. Integrated chisel into rockcraft to support chisel slices in stage-packages. Temporarily pinned craft-parts to a main branch commit pending an official release. Added a spread test for the dotnet-runtime-6.0_libs slice. |