fix: reconcile useful open recipe PRs in weekly run
This commit is contained in:
@@ -101,7 +101,12 @@ the real current recipe, not a stale mirror.
|
||||
3. If any has a newer supported upstream tag than what's pinned → there **is** an upgrade: proceed to
|
||||
plan/implement it (per §2, preserving any digest pin).
|
||||
- **Conclude `SKIPPED — up-to-date` only when** abra found no bump for the images it could read **and**
|
||||
the direct check finds nothing newer for the abra-unparseable images. If every image had a normal tag
|
||||
the direct check finds nothing newer for the abra-unparseable images **and no open PR still needs
|
||||
review**. Inspect open recipe PRs even when image tags are current. If a PR's useful change is
|
||||
already in current upstream, obsolete, or superseded, close it with a specific explanatory comment.
|
||||
If it is still useful, replay that change on current upstream, preserving the latest image tags and
|
||||
required configuration, then update and retest the same PR. A former GREEN result on an old head
|
||||
does not validate the rebased recipe. If every image had a normal tag
|
||||
abra could read, abra's verdict stands alone — no upstream check needed. A `tag and digest … not
|
||||
supported` FATA is a **trigger for the upstream check on that image, never a skip on its own.**
|
||||
- Check `git log HEAD..origin/main` and upstream PRs (`git.coopcloud.tech/coop-cloud/<recipe>/pulls`)
|
||||
@@ -276,6 +281,13 @@ only. The body must **also** carry the recommended release command — `abra rec
|
||||
final publish step (bumps the label + tags + pushes) after the upstream PR merges. Re-running with the
|
||||
same target version updates the existing same-branch PR rather than duplicating it.
|
||||
|
||||
For a useful open PR whose branch is not `upgrade-*`, set `RECIPE_PR_NUMBER=<number>` for
|
||||
`open-recipe-pr.sh` after replaying its change onto current upstream. The helper then rewrites that
|
||||
specific PR branch using `--force-with-lease`; never select an unrelated PR by inference. If several
|
||||
open PRs have useful compatible changes for the same recipe, combine them only after reviewing each
|
||||
diff and close the superseded PRs with links to the surviving PR. If a change cannot be made
|
||||
mergeable and verified, leave the PR clearly marked unresolved rather than reporting it as ready.
|
||||
|
||||
### 4. VERIFY by running `!testme` ON THE PR (results visible in the PR; iterate ≤3×)
|
||||
Trigger the **real** CI on the recipe PR by posting `!testme` — the bridge runs the harness on cc-ci
|
||||
and posts the run + its results back to the PR, so the operator sees them in the PR. Use the PR index
|
||||
@@ -357,8 +369,8 @@ Always state explicitly that **nothing was merged** — the PR(s) await operator
|
||||
them to turn a `dev-` deploy or `!testme` green. In DEFAULT mode, fix the recipe or leave a PR comment
|
||||
— never touch the gate. (Interim safeguard while the upgrader runs on the cc-ci host; see `IDEAS.md`.)
|
||||
- **Mirror reflects reality.** Each run force-syncs the `recipe-maintainers/<recipe>` mirror `main` to
|
||||
true upstream main and closes open PRs already merged upstream. It does NOT close superseded/unrelated
|
||||
open PRs. **An existing open upgrade PR is rewritten with one commit on the current upstream tip
|
||||
true upstream main and closes open PRs already merged upstream. The weekly review also closes stale
|
||||
PRs with no remaining value after checking their diff. **An existing useful PR is rewritten with one commit on the current upstream tip
|
||||
using `--force-with-lease`, then re-tested** — one evolving upgrade PR per recipe.
|
||||
- **Prefer a recipe-only PR.** Only open a cc-ci test PR (under `--with-tests`) when the upgrade is
|
||||
correct but a test is genuinely stale — never to paper over a real upgrade regression.
|
||||
|
||||
Reference in New Issue
Block a user