mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
13fbecb916
Using core.setOutput is much nicer than having to parse the json
"result" on the outside. This also avoids some very odd errors, when the
result can, for unknown reasons, *not* be parsed as JSON later on.
Also avoiding a bit of duplication between the "if mergeable" branches.
(cherry picked from commit 539e8d4f66)
66 lines
2.7 KiB
YAML
66 lines
2.7 KiB
YAML
name: Get merge commit
|
|
|
|
description: 'Checks whether the Pull Request is mergeable and returns two commit hashes: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
|
|
|
|
outputs:
|
|
mergedSha:
|
|
description: "The merge commit SHA"
|
|
value: ${{ steps.merged.outputs.mergedSha }}
|
|
targetSha:
|
|
description: "The target commit SHA"
|
|
value: ${{ steps.merged.outputs.targetSha }}
|
|
|
|
runs:
|
|
using: composite
|
|
steps:
|
|
- id: merged
|
|
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
|
|
with:
|
|
script: |
|
|
if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha)
|
|
|
|
for (const retryInterval of [5, 10, 20, 40, 80]) {
|
|
console.log("Checking whether the pull request can be merged...")
|
|
const prInfo = (await github.rest.pulls.get({
|
|
owner: context.repo.owner,
|
|
repo: context.repo.repo,
|
|
pull_number: context.payload.pull_request.number
|
|
})).data
|
|
|
|
if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
|
|
|
|
if (prInfo.mergeable == null) {
|
|
console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
|
|
await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
|
|
continue
|
|
}
|
|
|
|
let mergedSha, targetSha
|
|
|
|
if (prInfo.mergeable) {
|
|
console.log("The PR can be merged.")
|
|
|
|
mergedSha = prInfo.merge_commit_sha
|
|
targetSha = (await github.rest.repos.getCommit({
|
|
owner: context.repo.owner,
|
|
repo: context.repo.repo,
|
|
ref: prInfo.merge_commit_sha
|
|
})).data.parents[0].sha
|
|
} else {
|
|
console.log("The PR has a merge conflict.")
|
|
|
|
mergedSha = prInfo.head.sha
|
|
targetSha = (await github.rest.repos.compareCommitsWithBasehead({
|
|
owner: context.repo.owner,
|
|
repo: context.repo.repo,
|
|
basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
|
|
})).data.merge_base_commit.sha
|
|
}
|
|
|
|
console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
|
|
core.setOutput('mergedSha', mergedSha)
|
|
core.setOutput('targetSha', targetSha)
|
|
return
|
|
}
|
|
throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
|