fix: reconcile useful open recipe PRs in weekly run
This commit is contained in:
@@ -153,9 +153,18 @@ resolver finds the newer image. A warning is never evidence that an image is cur
|
||||
`newest_same_shape` and `newest_within_major`; a newer major is still a candidate for planning,
|
||||
though it must not be applied without a compatibility check.
|
||||
|
||||
Build `RECIPES_TO_UPGRADE` from every recipe with at least one candidate. Only label a recipe
|
||||
Build `RECIPES_TO_UPGRADE` from every recipe with at least one candidate **or an open recipe PR
|
||||
that still differs from current upstream**. The second case is a PR reconciliation candidate even
|
||||
when all image tags are current: review whether its change still adds value. If the change is
|
||||
already present, obsolete, or superseded, close the stale PR with a concrete reason. If it remains
|
||||
useful, carry its change onto current upstream, update the **same PR**, and run fresh `!testme`.
|
||||
Do not call it GREEN based on CI for an old head, or leave an unmergeable PR as the week's proposed
|
||||
fix. Count its CVEs only from the useful change still absent from current upstream.
|
||||
|
||||
Only label a recipe
|
||||
`up-to-date` if abra completed successfully **and** the resolver checked every relevant image
|
||||
(`all_resolved: true`) **and** neither found a candidate. If an image is unresolved, templated,
|
||||
(`all_resolved: true`) **and** neither found a candidate **and no open PR needs reconciliation**.
|
||||
If an image is unresolved, templated,
|
||||
floating, or lacks comparable tags, investigate it directly and record the evidence. Otherwise
|
||||
record `unverified` with the image and reason; never fold it into `up-to-date`. `dirty-worktree`
|
||||
applies only to real tracked edits. A tag+digest parse failure is not `not-fetchable`.
|
||||
@@ -205,6 +214,10 @@ description `"Upgrade <recipe> on cc-ci"`) with a prompt like:
|
||||
> upstream. Do NOT merge. Print exactly one `RESULT:` line as your final line (SUCCESS /
|
||||
> SUCCESS-PENDING-TESTS / FAILED / SKIPPED — `SUCCESS+TESTPR` will not occur in default mode).
|
||||
|
||||
For a recipe selected solely because it has an open PR, tell the worker which PR number to review.
|
||||
The worker may close it if no useful change remains; otherwise it must update that PR rather than
|
||||
opening another. A closure is a completed reconciliation, not an upgrade success.
|
||||
|
||||
**Why default (no `--with-tests`):** the weekly cron must never auto-edit cc-ci tests unattended — a
|
||||
test change deserves a human decision. So the cron opens recipe PRs only; where a recipe's existing
|
||||
test looks stale, the operator sees the explanation in the PR comment and can re-run that one recipe
|
||||
|
||||
Reference in New Issue
Block a user