From 271f3eb6d2430478356f2f8745676bd2d52a3e3c Mon Sep 17 00:00:00 2001 From: Jean-Paul van Ravensberg <14926452+DevSecNinja@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:14:50 +0100 Subject: [PATCH 1/2] docs(adr): mid-week rebases re-run CI with updateNotScheduled true ADR 0013's consequences still bounded rebases by the Saturday window. Closes #597 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../0013-rebase-automerge-branches-when-behind.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md b/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md index dfb71a23..7c9b1651 100644 --- a/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md +++ b/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md @@ -80,8 +80,9 @@ to `true`, so open branches are also rebased between windows._ ## Consequences - An open automerge PR that falls behind `main` is rebased (and its CI re-run) - on Renovate's next run inside the Saturday window. With the weekly group - that is usually one PR, so the extra cost is small and bounded by the window. + on Renovate's next run. Since `updateNotScheduled` is `true` again, that + can be mid-week, and each time `main` moves it costs another CI run. With the + weekly group that is usually one PR, so the extra cost stays small. - Lock-file maintenance and the dotfiles devcontainer image are rebased and branch-merged again instead of turning into PRs. - In repositories that require up-to-date branches, automerged updates are From 0fc60b3292c24637f344bd0277ed0fede3699c74 Mon Sep 17 00:00:00 2001 From: Jean-Paul van Ravensberg <14926452+DevSecNinja@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:21:16 +0100 Subject: [PATCH 2/2] docs(adr): qualify when mid-week rebases happen and what they cost Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../0013-rebase-automerge-branches-when-behind.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md b/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md index 7c9b1651..295aa9cb 100644 --- a/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md +++ b/docs/design-decisions/0013-rebase-automerge-branches-when-behind.md @@ -79,10 +79,12 @@ to `true`, so open branches are also rebased between windows._ ## Consequences -- An open automerge PR that falls behind `main` is rebased (and its CI re-run) - on Renovate's next run. Since `updateNotScheduled` is `true` again, that - can be mid-week, and each time `main` moves it costs another CI run. With the - weekly group that is usually one PR, so the extra cost stays small. +- An open automerge PR that falls behind `main` may be rebased (and its CI + re-run) on Renovate's next run, unless GitHub merges it first (see below). + Since `updateNotScheduled` is `true` again, that can be mid-week, so a moving + `main` can cause extra CI runs (one per Renovate run that rebases, however + often `main` moved in between). With the weekly group that is usually one + PR, so the extra cost stays small. - Lock-file maintenance and the dotfiles devcontainer image are rebased and branch-merged again instead of turning into PRs. - In repositories that require up-to-date branches, automerged updates are