fix: ensure [skip-ci] exists when automatic automerge from renovate

christophehurpeau · Jul 11, 2019 · badd77b · badd77b
1 parent 4503cbf
commit badd77b
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/pr-handlers/labelsChanged.ts b/src/pr-handlers/labelsChanged.ts
@@ -39,11 +39,28 @@ export default function labelsChanged(app: Application): void {
               );
               await updatePrBody(context, repoContext, {
                 autoMergeWithSkipCi: true,
+                // force label to avoid racing events (when both events are sent in the same time, reviewflow treats them one by one but the second event wont have its body updated)
+                autoMerge:
+                  autoMergeLabel &&
+                  context.payload.pull_request.labels.find(
+                    (l): boolean => l.id === autoMergeLabel.id,
+                  )
+                    ? true
+                    : repoContext.config.prDefaultOptions.autoMerge,
               });
               // }
             } else if (autoMergeLabel && label.id === autoMergeLabel.id) {
               await updatePrBody(context, repoContext, {
                 autoMerge: true,
+                // force label to avoid racing events (when both events are sent in the same time, reviewflow treats them one by one but the second event wont have its body updated)
+                // Note: si c'est renovate qui ajoute le label autoMerge, le label codeApprovedLabel n'aurait pu etre ajouté que par renovate également (on est a quelques secondes de l'ouverture de la pr par renovate)
+                autoMergeWithSkipCi:
+                  codeApprovedLabel &&
+                  context.payload.pull_request.labels.find(
+                    (l): boolean => l.id === codeApprovedLabel.id,
+                  )
+                    ? true
+                    : repoContext.config.prDefaultOptions.autoMergeWithSkipCi,
               });
             }
             await autoMergeIfPossible(context, repoContext);