Merge pull request #2252 from laughedelic/patch-1

version: take into account current PR labels
intuit · Sep 13, 2022 · a0137eb · a0137eb
2 parents 2a5d773 + f1880a7
commit a0137eb
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/packages/core/src/auto.ts b/packages/core/src/auto.ts
@@ -1829,23 +1829,20 @@ export default class Auto {
 
     let calculatedBump = await this.release.getSemverBump(lastRelease);
 
-    // For next releases we also want to take into account any labels on
-    // the PR of next into main
-    if (isPrerelease) {
-      const pr = getPrNumberFromEnv();
-
-      if (pr && this.semVerLabels) {
-        const prLabels = await this.git.getLabels(pr);
-        this.logger.verbose.info(
-          `Found labels on prerelease branch PR`,
-          prLabels
-        );
-        calculatedBump = calculateSemVerBump(
-          [prLabels, [calculatedBump]],
-          this.semVerLabels,
-          this.config
-        );
-      }
+    // Take into account any labels on the PR
+    const pr = getPrNumberFromEnv();
+
+    if (pr && this.semVerLabels) {
+      const prLabels = await this.git.getLabels(pr);
+      this.logger.verbose.info(
+        `Found labels on prerelease branch PR`,
+        prLabels
+      );
+      calculatedBump = calculateSemVerBump(
+        [prLabels, [calculatedBump]],
+        this.semVerLabels,
+        this.config
+      );
     }
 
     const bump =