← Back to issue list

cherry pick fixes to main

View original Github issue

Metadata

Project
rockcraft
Number
#667
Type
pull request
State
merged
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

Merged two fixes cherry-picked from feature/pydantic-2 to restore main. Approved by two reviewers, the change updates two files with minor adjustments to resolve breakage.

Suggested action: —

No scores available.

Issue body

These are two fixes done in `feature/pydantic-2`, cherry-picked here to unbreak `main`

Evaluation history

Date Model Scores Action Summary
qwen/qwen3.6-35b-a3b — — Merged two fixes cherry-picked from feature/pydantic-2 to restore main. Approved by two reviewers, the change updates two files with minor adjustments to resolve breakage.
qwen3.6-35b-a3b-mtp-q6 — — Merged two fixes cherry-picked from the feature/pydantic-2 branch to restore main branch functionality. A maintainer applied these changes directly to resolve broken builds without merging the full feature branch.
qwen3.6-35b-a3b-mtp-q6 — — Merged two fixes cherry-picked from feature/pydantic-2 to unbreak main. The maintainer applied these changes directly to restore primary branch functionality.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#353 Some fixes to unbreak main craft-application merged Merged to restore the main branch. Approved by two reviewers, the maintainer-submitted pull request applied minor fixes across three files (+5/-3 lines), successfully resolving the breakage.
74%
#408 chore!: merge pydantic 2 feature branch to main craft-application merged Merged the pydantic 2 feature branch into main, upgrading the codebase and resolving typing issues. Approved by two reviewers and passing CI checks, the merge introduces breaking changes required for the pydantic 2 dependency update.
72%
#486 docs: fixed broken references craft-parts merged Merged after rebasing on main to resolve a mypy test failure caused by a pydantic 2.0 update. Approved by three reviewers, the change fixes broken documentation references across four files.
70%