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.
2025-10-12 14:41:05 +02:00
parent eea09eb9d3
commit 89ace76ff1
1 changed files with 2 additions and 0 deletions
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -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 {