Skip to content

Commit

Permalink
Add support for auto-merge (#2336)
Browse files Browse the repository at this point in the history
* Add support for auto-merge

* Fix bad request-converter version

* Switch back to pull_request

pull_request_target is the wrong trigger for this action
  • Loading branch information
JoshMock authored Aug 12, 2024
1 parent d62d8c9 commit 4b8969c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Automerge

on:
pull_request_review:
types:
- submitted

jobs:
automerge:
runs-on: ubuntu-latest
steps:
- uses: reitermarkus/automerge@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
merge-method: squash
do-not-merge-labels: never-merge
pull-request-author-associations: OWNER
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Node CI

on:
pull_request_target: {}
pull_request: {}

jobs:
paths-filter:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"node": ">=18"
},
"devDependencies": {
"@elastic/request-converter": "^8.16.0",
"@elastic/request-converter": "^8.15.2",
"@sinonjs/fake-timers": "github:sinonjs/fake-timers#0bfffc1",
"@types/debug": "^4.1.7",
"@types/ms": "^0.7.31",
Expand Down

0 comments on commit 4b8969c

Please sign in to comment.