fix: release lock when pr is already merged

christophehurpeau · Apr 14, 2019 · 68b91df · 68b91df
1 parent 9f16948
commit 68b91df
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 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/dist/pr-handlers/actions/autoMergeIfPossible.d.ts.map b/dist/pr-handlers/actions/autoMergeIfPossible.d.ts.map
diff --git a/src/pr-handlers/actions/autoMergeIfPossible.ts b/src/pr-handlers/actions/autoMergeIfPossible.ts
@@ -44,12 +44,19 @@ export const autoMergeIfPossible = async (
   }
 
   if (pr.merged) {
+    repoContext.removeMergeLocked(context, pr.number);
     context.log.info(`automerge not possible: already merged pr ${pr.id}`);
     return false;
   }
 
+  context.log.info(
+    `automerge?: ${pr.id}, mergeable=${pr.mergeable} state=${
+      pr.mergeable_state
+    }`,
+  );
   if (!pr.mergeable) {
-    if (pr.mergeable_state === undefined) {
+    if (!pr.mergeable_state) {
+      context.log.info(`automerge not possible: rescheduling ${pr.id}`);
       // GitHub is determining whether the pull request is mergeable
       repoContext.reschedule(context, String(pr.id), pr.number);
       return false;