From f1880a7fd65853d80012699ad12976fd20d2a2a2 Mon Sep 17 00:00:00 2001 From: Alexey Alekhin Date: Thu, 8 Sep 2022 02:23:39 +0200 Subject: [PATCH] version: take into account current PR labels When running `auto version` from a PR, take into account its labels (not only for the next branch PRs) --- packages/core/src/auto.ts | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/packages/core/src/auto.ts b/packages/core/src/auto.ts index 68d0973ea..6ef50f0a7 100644 --- 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 =