fix merge_method

tgymnich · Jun 11, 2024 · 2b1af84 · 2b1af84
1 parent 90fff02
commit 2b1af84
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/lib/main.js b/lib/main.js
diff --git a/lib/main.js.map b/lib/main.js.map
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/src/main.ts b/src/main.ts
@@ -39,7 +39,16 @@ async function run() {
         await octokit.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pr.data.number, event: "APPROVE" });
     }
     if(autoMerge) {
+      if (mergeMethod == "merge") {
         await octokit.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pr.data.number, merge_method: "merge" });
+      } else if (mergeMethod == "rebase") {
+        await octokit.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pr.data.number, merge_method: "rebase" });
+      } else if (mergeMethod == "squash") {
+        await octokit.rest.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pr.data.number, merge_method: "squash" });
+      } else {
+        core.setFailed(`Unknown merge_method: ${mergeMethod}`);
+        return;
+      }
     }
   } catch (error: any) {
     if (error?.request?.request?.retryCount) {