electron · codebytere · Feb 11, 2021 · Feb 11, 2021
diff --git a/src/api-review-state.ts b/src/api-review-state.ts
@@ -3,6 +3,7 @@ import {
   API_REVIEW_CHECK_NAME,
   API_WORKING_GROUP,
   EXCLUDE_LABELS,
+  MASTER_BRANCH,
   MINIMUM_MINOR_OPEN_TIME,
   MINIMUM_PATCH_OPEN_TIME,
   NEW_PR_LABEL,
@@ -340,7 +341,8 @@ export function setupAPIReviewStateManagement(probot: Probot) {
     }
 
     const isSemverMajorMinor = [SEMVER_LABELS.MINOR, SEMVER_LABELS.MAJOR].includes(label.name);
-    const shouldExclude = pr.labels.some(l => EXCLUDE_LABELS.includes(l.name));
+    const shouldExclude =
+      pr.labels.some(l => EXCLUDE_LABELS.includes(l.name)) || pr.base.ref !== MASTER_BRANCH;
 
     // If a PR is semver-minor or semver-major and the PR does not have an
     // exclusion label, automatically add the 'api-review/requested 🗳' label.
@@ -370,6 +372,14 @@ export function setupAPIReviewStateManagement(probot: Probot) {
         });
         return;
       }
+    } else if (shouldExclude) {
+      // Remove the api-review/requested label if it was added prior to an exclusion label -
+      // for example if the backport label was added by trop after cation got to it.
+      await removeLabel(context.octokit, {
+        ...context.repo({}),
+        prNumber: pr.number,
+        name: REVIEW_LABELS.REQUESTED,
+      });
     }
 
     await addOrUpdateAPIReviewCheck(context.octokit, pr);

diff --git a/src/constants.ts b/src/constants.ts
@@ -12,6 +12,8 @@ export const BACKPORT_LABEL = 'backport';
 export const BACKPORT_SKIP_LABEL = 'backport-check-skip';
 export const FAST_TRACK_LABEL = 'fast-track 🚅';
 
+export const MASTER_BRANCH = 'master';
+
 export const SEMVER_NONE_LABEL = 'semver/none';
 export const SEMVER_LABELS = {
   PATCH: 'semver/patch',