Merge pull request #17 from diogotcorreia/stash-rebase

Add ability to stash and rebase in addition to merge

Author: orta

README.md

@@ -74,15 +74,19 @@ packages/documentation/copy/es/**/*.ts @KingDarBoja [translate] [es]
 
 ## Config
 
-There is only one option available ATM, `cwd` which can be used to determine the root folder to look for CODEOWNER files in:
+There are only two options available at the moment:
+
+- `cwd`, which can be used to determine the root folder to look for CODEOWNER files in.
+- `merge_method`, which can be `merge` (default), `squash` or `rebase`, depending on what you want the action to do.
 
 ```yml
 - name: Run Codeowners merge check
   uses: OSS-Docs-Tools/code-owner-self-merge@v1
   env:
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  with: 
+  with:
     cwd: './docs'
+    merge_method: 'squash'
 ```
 
 ### Dev

action.yml

@@ -10,6 +10,9 @@ inputs:
   cwd:
     description: 'The path to the root folder where it should look for code owners'
     default: ''
+  merge_method:
+    description: "The merge strategy to use: 'merge', 'squash' or 'rebase'"
+    default: 'merge'
 
 runs:
   using: 'node12'

index.js

@@ -139,7 +139,8 @@ async function mergeIfLGTMAndHasAccess() {
 
   core.info(`Creating comments and merging`)
   try {
-    await octokit.pulls.merge({ ...thisRepo, pull_number: issue.number });
+    // @ts-ignore
+    await octokit.pulls.merge({ ...thisRepo, pull_number: issue.number, merge_method: core.getInput('merge_method') || 'merge' });
     await octokit.issues.createComment({ ...thisRepo, issue_number: issue.number, body: `Merging because @${sender} is a code-owner of all the changes - thanks!` });
   } catch (error) {
     await octokit.issues.createComment({ ...thisRepo, issue_number: issue.number, body: `There was an issue merging, maybe try again ${sender}.` });