fix: skip ci label to ensure it stays after renovate rebase

src/orgsConfigs/christophehurpeau.ts

@@ -65,6 +65,10 @@ const config: Config<'dev', never> = {
         name: ':soon: automerge',
         color: '#64DD17',
       },
+      'merge/skip-ci': {
+        name: 'automerge/skip-ci',
+        color: '#e1e8ed',
+      },
 
       /* feature-branch */
       'feature-branch': {

src/orgsConfigs/ornikar.ts

@@ -180,6 +180,10 @@ const config: Config<'dev' | 'design', 'archis' | 'frontends' | 'backends'> = {
         name: ':soon: automerge',
         color: '#64DD17',
       },
+      'merge/skip-ci': {
+        name: 'automerge/skip-ci',
+        color: '#e1e8ed',
+      },
 
       /* feature-branch */
       'feature-branch': {

src/pr-handlers/actions/editOpenedPR.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 import { PullsGetResponse } from '@octokit/rest';
 import Webhooks from '@octokit/webhooks';
 import { Context } from 'probot';
@@ -70,7 +71,7 @@ export const editOpenedPR = async (
       ref: pr.head.sha,
     }),
   )).data.check_runs.find(
-    (check) => check.name === `${process.env.REVIEWFLOW_NAME}/lint-pr`,
+    (check): boolean => check.name === `${process.env.REVIEWFLOW_NAME}/lint-pr`,
   );
 
   await Promise.all<any>(
@@ -122,21 +123,28 @@ export const editOpenedPR = async (
 
   const featureBranchLabel = repoContext.labels['feature-branch'];
   const automergeLabel = repoContext.labels['merge/automerge'];
+  const skipCiLabel = repoContext.labels['merge/skip-ci'];
 
   const prHasFeatureBranchLabel = Boolean(
     featureBranchLabel &&
       pr.labels.find((label): boolean => label.id === featureBranchLabel.id),
   );
 
+  const prHasSkipCiLabel = Boolean(
+    skipCiLabel &&
+      pr.labels.find((label): boolean => label.id === skipCiLabel.id),
+  );
+
   const prHasAutoMergeLabel = Boolean(
     automergeLabel &&
       pr.labels.find((label): boolean => label.id === automergeLabel.id),
   );
 
   const defaultOptions = {
     ...repoContext.config.prDefaultOptions,
-    autoMerge: prHasAutoMergeLabel,
     featureBranch: prHasFeatureBranchLabel,
+    autoMergeWithSkipCi: prHasSkipCiLabel,
+    autoMerge: prHasAutoMergeLabel,
   };
 
   const { body, options } = updateBody(pr.body, defaultOptions, statuses
@@ -160,17 +168,33 @@ export const editOpenedPR = async (
   }
 
   if (options && (featureBranchLabel || automergeLabel)) {
-    if (featureBranchLabel) {
-      if (prHasFeatureBranchLabel && !options.featureBranch) {
+    const syncLabel = async (
+      label: any,
+      prHasLabel: boolean,
+      optionKey: keyof typeof options,
+    ) => {
+      if (prHasLabel && !options[optionKey]) {
         await context.github.issues.removeLabel(
-          context.issue({ name: featureBranchLabel.name }),
+          context.issue({ name: label.name }),
         );
       }
-      if (options.featureBranch && !prHasFeatureBranchLabel) {
+      if (options[optionKey] && !prHasLabel) {
         await context.github.issues.addLabels(
-          context.issue({ labels: [featureBranchLabel.name] }),
+          context.issue({ labels: [label.name] }),
         );
       }
+    };
+
+    if (featureBranchLabel) {
+      await syncLabel(
+        featureBranchLabel,
+        prHasFeatureBranchLabel,
+        'featureBranch',
+      );
+    }
+
+    if (skipCiLabel) {
+      await syncLabel(skipCiLabel, prHasSkipCiLabel, 'autoMergeWithSkipCi');
     }
 
     if (automergeLabel) {

src/pr-handlers/labelsChanged.ts

@@ -23,6 +23,7 @@ export default function labelsChanged(app: Application): void {
         if (fromRenovate) {
           const codeApprovedLabel = repoContext.labels['code/approved'];
           const autoMergeLabel = repoContext.labels['merge/automerge'];
+          const autoMergeSkipCiLabel = repoContext.labels['merge/skip-ci'];
           if (context.payload.action === 'labeled') {
             if (codeApprovedLabel && label.id === codeApprovedLabel.id) {
               // const { data: reviews } = await context.github.pulls.listReviews(
@@ -32,6 +33,11 @@ export default function labelsChanged(app: Application): void {
               await context.github.pulls.createReview(
                 context.issue({ event: 'APPROVE' }),
               );
+              if (autoMergeSkipCiLabel) {
+                await context.github.issues.addLabels(
+                  context.issue({ labels: [autoMergeSkipCiLabel.name] }),
+                );
+              }
               await updateStatusCheckFromLabels(pr, context, repoContext);
               await updatePrBody(pr, context, repoContext, {
                 autoMergeWithSkipCi: true,
@@ -77,15 +83,19 @@ export default function labelsChanged(app: Application): void {
 
         const featureBranchLabel = repoContext.labels['feature-branch'];
         const automergeLabel = repoContext.labels['merge/automerge'];
+        const skipCiLabel = repoContext.labels['merge/skip-ci'];
 
-        if (
-          (featureBranchLabel && label.id === automergeLabel.id) ||
-          (automergeLabel && label.id === automergeLabel.id)
-        ) {
-          const option: 'featureBranch' | 'autoMerge' =
-            featureBranchLabel && label.id === featureBranchLabel.id
-              ? 'featureBranch'
-              : 'autoMerge';
+        const option = (() => {
+          if (featureBranchLabel && label.id === automergeLabel.id)
+            return 'featureBranch';
+          if (automergeLabel && label.id === automergeLabel.id)
+            return 'autoMerge';
+          if (skipCiLabel && label.id === skipCiLabel.id)
+            return 'autoMergeWithSkipCi';
+          return null;
+        })();
+
+        if (option) {
           await updatePrBody(pr, context, repoContext, {
             [option]: context.payload.action === 'labeled',
           });