From 4cb689fd6597ac7be0b47acff0ea97f197e46699 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 18 Nov 2025 19:04:30 +0100 Subject: [PATCH] ci/github-script/prepare: fix with missing release- branch The prepare script is currently failing for staging-25.11 PR's, because it assumes that a release-25.11 exists respectively. This is not the case in the transition phase before branch-off. We can fix this by always including the current target branch in the branches to check for, even if it's not a WIP branch. This means we might check some branches twice, but that's better than erroring out entirely when the branch is in fact correct. --- ci/github-script/prepare.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js index 7ef825a3ca175..ce058edd2af7a 100644 --- a/ci/github-script/prepare.js +++ b/ci/github-script/prepare.js @@ -128,10 +128,7 @@ module.exports = async ({ github, context, core, dry }) => { ) // Make sure that we always check the current target as well, even if its a WIP branch. - // If it's not a WIP branch, it was already included in either releases or secondary. - if (classify(base.ref).type.includes('wip')) { - secondary.push(classify(base.ref)) - } + secondary.push(classify(base.ref)) for (const branch of secondary) { const nextCandidate = await mergeBase(branch)