feat: add option autoMerge

christophehurpeau · May 25, 2019 · e418623 · e418623
1 parent 534436a
commit e418623
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/dist/index-node10-dev.cjs.js b/dist/index-node10-dev.cjs.js
diff --git a/dist/index-node10-dev.cjs.js.map b/dist/index-node10-dev.cjs.js.map
diff --git a/dist/index-node10.cjs.js b/dist/index-node10.cjs.js
diff --git a/dist/index-node10.cjs.js.map b/dist/index-node10.cjs.js.map
diff --git a/src/pr-handlers/actions/editOpenedPR.ts b/src/pr-handlers/actions/editOpenedPR.ts
@@ -4,6 +4,7 @@ import { RepoContext } from '../../context/repoContext';
 import { StatusError, StatusInfo } from '../../teamconfigs/types';
 import { cleanTitle } from './utils/cleanTitle';
 import { updateBody } from './utils/updateBody';
+import { autoMergeIfPossible } from './autoMergeIfPossible';
 
 interface StatusWithInfo {
   name: string;
@@ -178,9 +179,15 @@ export const editOpenedPR = async (
         );
       }
       if (options.autoMerge && !prHasAutoMergeLabel) {
-        await context.github.issues.addLabels(
+        const result = await context.github.issues.addLabels(
           context.issue({ labels: [automergeLabel.name] }),
         );
+        await autoMergeIfPossible(
+          context,
+          repoContext,
+          context.payload.pull_request,
+          result.data,
+        );
       }
     }
   }