fix: try to automerge when automerge label is added

christophehurpeau · May 23, 2020 · f49f2ce · f49f2ce
1 parent f3f09b3
commit f49f2ce
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 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/labelsChanged.ts b/src/pr-handlers/labelsChanged.ts
@@ -109,11 +109,9 @@ export default function labelsChanged(
             await updatePrBody(pr, context, repoContext, {
               [option]: context.payload.action === 'labeled',
             });
-          } else if (context.payload.action === 'labeled') {
-            if (
-              repoContext.labels['merge/automerge'] &&
-              label.id === repoContext.labels['merge/automerge'].id
-            ) {
+          } // not an else if
+          if (context.payload.action === 'labeled') {
+            if (automergeLabel && label.id === automergeLabel.id) {
               await autoMergeIfPossible(pr, context, repoContext);
             }
           }