feat: merge with specified method

README.md

@@ -5,7 +5,7 @@ This action will automatically merge your PR once all requirements are met!
 # v1 Roadmap
 
 - [x] handle pr reviews
-- [ ] various types of merge: squash and rebase
+- [x] various types of merge: squash and rebase
 - [x] blacklist based on labels
 - [x] whitelist based on labels
 
@@ -92,4 +92,5 @@ It can hold the following fields:
 | field | type | description |
 | --- | --- | --- |
 | whitelist | string[] | whitelisted labels to perform automerge |
-| blacklist | string[] | blacklisted labels to forbid automerge |
+| blacklist | string[] | blacklisted labels to forbid automerge |
+| method | "merge" \| "squash" \| "rebase" | method to use when merging |

bin/index.js

@@ -11785,6 +11785,7 @@ function mergeIfReady(client, owner, repo, number, sha, config) {
                 repo,
                 pull_number: number,
                 sha,
+                merge_method: config.method,
             });
         }
     });

src/__tests__/mergeIfReady.ts

@@ -19,7 +19,13 @@ describe('mergeIfReady', () => {
         get.mockClear()
         canMerge.mockClear()
     })
-    it('merges pr it can be merged', async () => {
+    it.each`
+        method
+        ${undefined}
+        ${'merge'}
+        ${'squash'}
+        ${'rebase'}
+    `('merges pr with $method if it can be merged', async ({ method }) => {
         const prNumber = 42
         const repo = 'repo'
         const owner = 'owner'
@@ -38,6 +44,7 @@ describe('mergeIfReady', () => {
         const config: Config = {
             whitelist,
             blacklist,
+            method,
         }
         await mergeIfReady(
             (client as unknown) as Client,
@@ -61,6 +68,7 @@ describe('mergeIfReady', () => {
             repo,
             pull_number: prNumber,
             sha,
+            merge_method: method,
         })
     })
     it('does not merge pr if it is not allowed to merge', async () => {

src/mergeIfReady.ts

@@ -27,6 +27,7 @@ export default async function mergeIfReady(
             repo,
             pull_number: number,
             sha,
+            merge_method: config.method,
         })
     }
 }

src/types.ts

@@ -9,6 +9,7 @@ export type Client = github.GitHub
 export interface Config {
     whitelist: string[]
     blacklist: string[]
+    method?: 'merge' | 'squash' | 'rebase'
 }
 
 export interface PullRequestPayload {