chore(renovate): rebase conflicted PRs on every merge to main
Renovate only rebases while it runs, and it ran once a week, so merging one dependency PR left its siblings (nearly all touch gradle/libs.versions.toml) conflicted until the next Monday or a manual dispatch. Also run on push to main, and move the weekly gate into a renovate.json5 schedule window so on-merge runs only maintain existing branches and never open new PRs.
This commit is contained in:
1 parent
53d5e2c5aa
commit
e7ae05c88f
3 files changed
+27
-9
No files matched your search
+6
-4
@@ -94,10 +94,12 @@ release work when a merge actually cuts a release:
|
||||
`values-*/strings.xml`, so Weblate PRs get fast feedback. Runs on every PR
|
||||
without a path filter, so the required `Translations / check` status is always
|
||||
reported.
|
||||
- **`renovate.yml`** (`.gitea/workflows/`, Mondays 05:00 UTC plus
|
||||
`workflow_dispatch`, **Gitea**) — the dependency sweep. Runs the pinned
|
||||
Renovate image as its job container and targets Codeberg's API; the cadence
|
||||
lives here, not in `renovate.json5`, so the two don't double-gate.
|
||||
- **`renovate.yml`** (`.gitea/workflows/`, Mondays 05:00 UTC, on push to
|
||||
`main`, plus `workflow_dispatch`, **Gitea**) — the dependency sweep. Runs the
|
||||
pinned Renovate image as its job container and targets Codeberg's API. New
|
||||
PRs only open in the Monday `schedule` window in `renovate.json5` (keep it
|
||||
bracketing the cron); the on-merge runs fall outside it and only rebase
|
||||
existing PRs that the merge left conflicted.
|
||||
- **`release.yaml`** (`.gitea/workflows/`, on push to `main` plus
|
||||
`workflow_dispatch`, **Gitea**) — a cheap `detect` job reads `versionName` and
|
||||
checks **Codeberg** for a tag for it. Only when there isn't one does the
|
||||
|
||||
Reference in new issue
Block a user