Unverified Commit d086c6c6 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

ci/github-script/merge: add hint about stuck GitHub 

Unfortunately it still happens frequently that, after enabling
auto-merge, GitHub is stuck even though all checks have passed, and
doesn't merge the PR. Any contributor can trigger GitHub again with an
approval of the PR - this will then immediately queue the PR for merge.

Adding a hint to the posted comment, should help users through this
without my intervention.
parent 03cac939

ci/github-script/merge.js

+10 −3
Original line number Diff line number Diff line
@@ -182,7 +182,9 @@ async function handleMerge({ 
        }`,

        { node_id: pull_request.node_id, sha: pull_request.head.sha },

      )

      return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`

      return [

        `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`,

      ]

    } catch (e) {

      log('Enqueing failed', e.response.errors[0].message)

    }
@@ -201,7 +203,12 @@ async function handleMerge({ 
        }`,

        { node_id: pull_request.node_id, sha: pull_request.head.sha },

      )

      return 'Enabled Auto Merge'

      return [

        `:heavy_check_mark: Enabled Auto Merge (#306934)`,

        '',

        '> [!TIP]',

        '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',

      ]

    } catch (e) {

      log('Auto Merge failed', e.response.errors[0].message)

      throw new Error(e.response.errors[0].message)
@@ -287,7 +294,7 @@ async function handleMerge({ 
    if (result) {

      await react('ROCKET')

      try {

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

        body.push(...(await merge()))

      } catch (e) {

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

        body.shift()