feat: add option autoMergeRenovateWithSkipCi, now disabled by default

christophehurpeau · Aug 5, 2020 · 09c0353 · 09c0353
1 parent 533d790
commit 09c0353
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/src/accountConfigs/ornikar.ts b/src/accountConfigs/ornikar.ts
@@ -5,6 +5,7 @@ const config: Config<'dev' | 'design', 'ops' | 'frontends' | 'backends'> = {
   trimTitle: true,
   ignoreRepoPattern: '(infra-.*|devenv)',
   requiresReviewRequest: true,
+  autoMergeRenovateWithSkipCi: true,
   prDefaultOptions: {
     featureBranch: false,
     autoMergeWithSkipCi: false,

diff --git a/src/accountConfigs/types.ts b/src/accountConfigs/types.ts
@@ -64,6 +64,7 @@ export interface Config<GroupNames extends string, TeamNames extends string> {
   trimTitle?: boolean;
   ignoreRepoPattern?: string;
   requiresReviewRequest?: boolean;
+  autoMergeRenovateWithSkipCi?: boolean;
   parsePR: ParsePR;
   prDefaultOptions: Options;
 

diff --git a/src/events/pr-handlers/labelsChanged.ts b/src/events/pr-handlers/labelsChanged.ts
@@ -59,18 +59,29 @@ export default function labelsChanged(
               await context.github.pulls.createReview(
                 contextPr(context, { event: 'APPROVE' }),
               );
-              if (autoMergeSkipCiLabel) {
-                await context.github.issues.addLabels(
+
+              let labels = pr.labels;
+              const autoMergeWithSkipCi =
+                autoMergeSkipCiLabel &&
+                repoContext.config.autoMergeRenovateWithSkipCi;
+              if (autoMergeWithSkipCi) {
+                const result = await context.github.issues.addLabels(
                   contextIssue(context, {
                     labels: [autoMergeSkipCiLabel.name],
                   }),
                 );
+                labels = result.data;
               }
-              await updateStatusCheckFromLabels(updatedPrContext, pr, context);
+              await updateStatusCheckFromLabels(
+                updatedPrContext,
+                pr,
+                context,
+                labels,
+              );
               await updatePrCommentBody(updatedPrContext, context, {
-                autoMergeWithSkipCi: true,
+                autoMergeWithSkipCi,
                 // 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: hasLabelInPR(pr.labels, autoMergeLabel)
+                autoMerge: hasLabelInPR(labels, autoMergeLabel)
                   ? true
                   : repoContext.config.prDefaultOptions.autoMerge,
               });