Unverified Commit 4cb689fd authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

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.
parent 03616659

ci/github-script/prepare.js

+1 −4
Original line number Diff line number Diff line
@@ -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))

      }



      for (const branch of secondary) {

        const nextCandidate = await mergeBase(branch)