Skip to content

Commit 8fc91f5

Browse files
committed
Update to auto-merge script
1 parent a4853e9 commit 8fc91f5

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

.github/workflows/auto-merge.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Dependabot auto-merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: ${{ github.actor == 'dependabot[bot]' }}
12+
steps:
13+
- name: Dependabot metadata
14+
id: metadata
15+
uses: dependabot/[email protected]
16+
with:
17+
github-token: "${{ secrets.GITHUB_TOKEN }}"
18+
- name: Enable auto-merge for Dependabot PRs
19+
run: gh pr merge --auto --merge "$PR_URL"
20+
env:
21+
PR_URL: ${{github.event.pull_request.html_url}}
22+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/main.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,3 @@ jobs:
2424
ruby-version: ${{ matrix.ruby }}
2525
- name: Test
2626
run: bundle exec rake test
27-
28-
automerge:
29-
name: AutoMerge
30-
needs:
31-
- ci
32-
runs-on: ubuntu-latest
33-
if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
34-
steps:
35-
- uses: actions/github-script@v3
36-
with:
37-
script: |
38-
github.pulls.merge({
39-
owner: context.payload.repository.owner.login,
40-
repo: context.payload.repository.name,
41-
pull_number: context.payload.pull_request.number
42-
})

0 commit comments

Comments
 (0)