From 96942f5e45168623ca4b6df2075d79a8d0a69a80 Mon Sep 17 00:00:00 2001 From: jupblb Date: Thu, 14 May 2026 06:46:35 +0200 Subject: [PATCH] chore: keep Renovate PRs rebased and tolerate auto-fix commits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two related Renovate config additions to make stacked Renovate PRs self-resolve instead of piling up red after one of them merges: * `rebaseWhen: behind-base-branch` — Renovate proactively regenerates every PR that is behind main on its next run, instead of waiting for a hard conflict to be detected. * `gitIgnoredAuthors` — by default Renovate refuses to touch a PR branch whose history contains commits from a non-Renovate author, which would freeze every PR after the first auto-fix commit from the update-vendor-hash workflow. Add the `github-actions[bot]` identity that workflow commits under so Renovate keeps regenerating those branches; the workflow then re-runs on the force-push and recomputes the correct vendorHash for the new dep state. --- .github/renovate.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 22a99432..f01c8eee 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,4 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:recommended"] + "extends": ["config:recommended"], + "rebaseWhen": "behind-base-branch", + "gitIgnoredAuthors": ["41898282+github-actions[bot]@users.noreply.github.com"] }