From 4b8969cc784856bdd4fe79feb7b9c8f0c836ce65 Mon Sep 17 00:00:00 2001
From: Josh Mock <joshua.mock@elastic.co>
Date: Mon, 12 Aug 2024 14:15:55 -0500
Subject: [PATCH] Add support for auto-merge (#2336)

* 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
---
 .github/workflows/auto-merge.yml | 17 +++++++++++++++++
 .github/workflows/nodejs.yml     |  2 +-
 package.json                     |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/auto-merge.yml

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 000000000..53d4557f8
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -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
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 7b61028d4..aa0ea28be 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -2,7 +2,7 @@
 name: Node CI
 
 on:
-  pull_request_target: {}
+  pull_request: {}
 
 jobs:
   paths-filter:
diff --git a/package.json b/package.json
index a2f5293f7..0eb974659 100644
--- a/package.json
+++ b/package.json
@@ -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",