Skip to content

Commit 41c3ece

Browse files
authored
Merge pull request #153 from ruby-syntax-tree/2-7
Add auto-merge
2 parents 1fb61b7 + f79754f commit 41c3ece

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

.github/workflows/auto-merge.yml

+22
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

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Main
22
on:
33
- push
4-
- pull_request_target
4+
- pull_request
55
jobs:
66
ci:
77
strategy:
@@ -40,20 +40,3 @@ jobs:
4040
run: |
4141
bundle exec rake stree:check
4242
bundle exec rubocop
43-
44-
automerge:
45-
name: AutoMerge
46-
needs:
47-
- ci
48-
- check
49-
runs-on: ubuntu-latest
50-
if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
51-
steps:
52-
- uses: actions/github-script@v3
53-
with:
54-
script: |
55-
github.pulls.merge({
56-
owner: context.payload.repository.owner.login,
57-
repo: context.payload.repository.name,
58-
pull_number: context.payload.pull_request.number
59-
})

0 commit comments

Comments
 (0)