Skip to content

Commit f1e3d3d

Browse files
authored
fix: auto merge (#12858)
Running into issues with `gh pr merge --auto --merge "$PR_URL"`
1 parent 763a82d commit f1e3d3d

File tree

1 file changed

+47
-6
lines changed

1 file changed

+47
-6
lines changed

.github/workflows/dependabot-auto-merge.yml

+47-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dependabot Auto-merge
1+
name: Dependabot auto-merge
22
on: pull_request_target
33

44
permissions:
@@ -15,10 +15,51 @@ jobs:
1515
uses: dependabot/fetch-metadata@v2
1616
with:
1717
github-token: '${{ secrets.GITHUB_TOKEN }}'
18-
1918
- name: Approve and /shipit Dependabot PRs for patch and minor versions
2019
if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
21-
run: gh pr merge --auto --merge "$PR_URL"
22-
env:
23-
PR_URL: ${{github.event.pull_request.html_url}}
24-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
20+
uses: actions/github-script@v7
21+
with:
22+
github-token: '${{ secrets.GITHUB_TOKEN }}'
23+
script: |
24+
const getPullRequestIdQuery = `query GetPullRequestId($owner: String!, $repo: String!, $pullRequestNumber: Int!) {
25+
repository(owner: $owner, name: $repo) {
26+
pullRequest(number: $pullRequestNumber) {
27+
id
28+
}
29+
}
30+
}`
31+
const repoInfo = {
32+
owner: context.repo.owner,
33+
repo: context.repo.repo,
34+
pullRequestNumber: context.issue.number,
35+
}
36+
const response = await github.graphql(getPullRequestIdQuery, repoInfo)
37+
38+
await github.rest.pulls.createReview({
39+
pull_number: context.issue.number,
40+
owner: context.repo.owner,
41+
repo: context.repo.repo,
42+
event: 'APPROVE',
43+
})
44+
45+
const enableAutoMergeQuery = `mutation ($pullRequestId: ID!, $mergeMethod: PullRequestMergeMethod!) {
46+
enablePullRequestAutoMerge(input: {
47+
pullRequestId: $pullRequestId,
48+
mergeMethod: $mergeMethod
49+
}) {
50+
pullRequest {
51+
autoMergeRequest {
52+
enabledAt
53+
enabledBy {
54+
login
55+
}
56+
}
57+
}
58+
}
59+
}`
60+
const data = {
61+
pullRequestId: response.repository.pullRequest.id,
62+
mergeMethod: 'MERGE',
63+
}
64+
65+
await github.graphql(enableAutoMergeQuery, data)

0 commit comments

Comments
 (0)