Unverified Commit 89ace76f authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

workflows/bot: retry failed merges 

By not keeping the node_id in the comments resulting from a failed
merge, these merges will be automatically retried.
parent eea09eb9

ci/github-script/merge.js

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ async function handleMerge({ 
      try {

        body.push(`:heavy_check_mark: ${await merge()} (#306934)`)

      } catch (e) {

        // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.

        body.shift()

        body.push(`:x: Merge failed with: ${e} (#371492)`)

      }

    } else {