gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci/github-script/merge: add hint about stuck GitHub (#459122)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-11-06 17:11:28 +00:00
committed by GitHub
parent c0c8f59e4e d086c6c6b3
commit 1311ce348c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ci/github-script/merge.js
View File

@@ -191,7 +191,9 @@ async function handleMerge({
}`, }`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha }, { 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) { } catch (e) {
log('Enqueing failed', e.response.errors[0].message) log('Enqueing failed', e.response.errors[0].message)
} }
@@ -210,7 +212,12 @@ async function handleMerge({
}`, }`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha }, { 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) { } catch (e) {
log('Auto Merge failed', e.response.errors[0].message) log('Auto Merge failed', e.response.errors[0].message)
throw new Error(e.response.errors[0].message) throw new Error(e.response.errors[0].message)
@@ -296,7 +303,7 @@ async function handleMerge({
if (result) { if (result) {
await react('ROCKET') await react('ROCKET')
try { try {
body.push(`:heavy_check_mark: ${await merge()} (#306934)`) body.push(...(await merge()))
} catch (e) { } catch (e) {
// Remove the HTML comment with node_id reference to allow retrying this merge on the next run. // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
body.shift() body.shift()