fix: squash weekly recipe PRs before CI
This commit is contained in:
@@ -264,11 +264,13 @@ ssh cc-ci "GITEA_USERNAME='$GITEA_USERNAME' GITEA_PASSWORD='$GITEA_PASSWORD' GIT
|
||||
```
|
||||
This (a) re-syncs mirror `main` to true upstream main, (b) **closes any open PR already merged
|
||||
upstream** (merging it would be a no-op), then handles the upgrade PR: **if an open upgrade PR already
|
||||
exists for this recipe (branch `upgrade-*`), the new work is pushed onto THAT PR's branch and the PR is
|
||||
updated + re-tested** — one evolving upgrade PR per recipe, not a second parallel one. Only if none
|
||||
exists for this recipe (branch `upgrade-*`), its branch is replaced with one commit directly on the
|
||||
current upstream tip using `--force-with-lease`, then the PR is updated + re-tested** — one evolving
|
||||
upgrade PR per recipe with one commit, not a second parallel PR. Only if none
|
||||
exists is a fresh `upgrade-<version>` PR opened. Unrelated open PRs (e.g. a backup fix) are **NOT**
|
||||
closed or touched — the operator decides on those. The PR's diff is exactly this upgrade against the
|
||||
real current upstream main. Capture the `PR_URL`. Export `RECIPE_PR_BODY` first (image-tag table + the
|
||||
real current upstream main. This squash happens **before `!testme`**, so CI tests the one-commit PR
|
||||
head. Capture the `PR_URL`. Export `RECIPE_PR_BODY` first (image-tag table + the
|
||||
planned operator-action notes) — and **the PR body MUST link the upstream release notes**: for each
|
||||
upgraded image/service, pull its release-notes URL from the registry `cc-ci-plan/upstream/<recipe>.md`
|
||||
(between the current → new version) and include one explicit line per service in the body, e.g.
|
||||
@@ -297,7 +299,9 @@ POST=0 /srv/cc-ci/.claude/skills/recipe-upgrade/testme-on-pr.sh <recipe> <pr-ind
|
||||
Read the failing run (linked from the PR / the harness log on cc-ci) and classify:
|
||||
|
||||
**5a. The UPGRADE itself is broken** (real regression: bad tag, missing migration, config gap) — fix
|
||||
it on the recipe branch, push, and re-run `!testme` (within the 3-run budget). The recipe PR is only
|
||||
it on the local recipe branch, then re-run `open-recipe-pr.sh` from step 3 to squash the corrected
|
||||
tree into one commit on the PR branch **before** re-running `!testme` (within the 3-run budget).
|
||||
Do not push a fix commit directly to the PR branch. The recipe PR is only
|
||||
"working" once `!testme` is GREEN. If still red after 3 runs, leave the PR open (its red `!testme`
|
||||
results stand as the evidence) and report `FAILED — upgrade not green after 3 !testme runs`.
|
||||
|
||||
@@ -359,8 +363,8 @@ Always state explicitly that **nothing was merged** — the PR(s) await operator
|
||||
— 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 extended (new work pushed onto its branch + re-tested)
|
||||
rather than spawning a second upgrade PR** — one evolving upgrade PR per recipe.
|
||||
open PRs. **An existing open upgrade 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.
|
||||
- **Never weaken a test**; **bounded** changes (the upgrade + minimal test update, not rewrites).
|
||||
|
||||
Reference in New Issue
Block a user