From b123018e99220528532ecea478fab3b147589deb Mon Sep 17 00:00:00 2001 From: Robin Lungwitz Date: Wed, 22 Apr 2026 10:23:57 +0200 Subject: [PATCH 1/2] feat(renovate-preset): add automergeSchedule to `automerge.json5` preset **WHY** We noticed in some situation after adopting the automerge preset offered by us causes some PR merges during undesired hours. These depend on the repository configuration and are caused by the bypass of the default branch protection rule that is necessary to keep the branch-merge preset working. --- renovate-presets/automerge.json5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renovate-presets/automerge.json5 b/renovate-presets/automerge.json5 index 08974bf..5f78adc 100644 --- a/renovate-presets/automerge.json5 +++ b/renovate-presets/automerge.json5 @@ -17,6 +17,12 @@ Prerequisites for this preset: "schedule": [ "* 9-13 * * 1-5" ], + /* Maintain backwards compatibility for repositories + that do not require a merge queue and thus control + automerges in renovate still */ + "automergeSchedule": [ + "* 9-13 * * 1-5" + ], "automerge": true, "automergeType": "pr", "automergeStrategy": "auto", From bd19901d9d0c98f406a94a72e353be98ad8a1415 Mon Sep 17 00:00:00 2001 From: Robin Lungwitz Date: Wed, 22 Apr 2026 10:24:39 +0200 Subject: [PATCH 2/2] docs(renovate-preset): add comments to important parts of the preset --- renovate-presets/automerge.json5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renovate-presets/automerge.json5 b/renovate-presets/automerge.json5 index 5f78adc..81e15fb 100644 --- a/renovate-presets/automerge.json5 +++ b/renovate-presets/automerge.json5 @@ -14,6 +14,9 @@ Prerequisites for this preset: "patch", "digest" ], + // Create PRs only during working hours + // This controls the update window for scenarios using platform automerge + // when renovate loses control over the merge schedule "schedule": [ "* 9-13 * * 1-5" ], @@ -26,7 +29,10 @@ Prerequisites for this preset: "automerge": true, "automergeType": "pr", "automergeStrategy": "auto", + // Enable Github automerge (renovate loses control over the merge schedule) "platformAutomerge": true, + // Create PRs only if the stability days check has passed + // This prevents premature PR merges "prCreation": "not-pending", "internalChecksFilter": "strict", "rebaseWhen": "conflicted"