diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index c1f7857ec3..47f560e10b 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,7 +42,7 @@ jobs: semver_pattern: '^pre-release/(.*)$' # ^v?(.*)$ by default - name: Apply prereleaseName - run: node common/scripts/apply-prerelease-version.js ${{ steps.semver_parser.outputs.pre_release_name }} ${{ steps.semver_parser.outputs.main }} + run: node common/scripts/apply-release-version.js ${{ steps.semver_parser.outputs.pre_release_name }} ${{ steps.semver_parser.outputs.main }} - name: Build packages env: diff --git a/common/scripts/apply-prerelease-version.js b/common/scripts/apply-release-version.js similarity index 100% rename from common/scripts/apply-prerelease-version.js rename to common/scripts/apply-release-version.js diff --git a/common/scripts/set-prerelease-version.js b/common/scripts/set-prerelease-version.js index 664642e70b..991aa25183 100644 --- a/common/scripts/set-prerelease-version.js +++ b/common/scripts/set-prerelease-version.js @@ -40,7 +40,7 @@ function writePrereleaseVersion(nextBump, preReleaseName, nextVersionStr, buildN let nextVersion = nextVersionStr ? nextVersionStr : `${curVersion.major}.${curVersion.minor}.${curVersion.patch}`; - if (preReleaseName) { + if (preReleaseName && preReleaseName !== 'none') { nextVersion = `${nextVersion}-${preReleaseName}`; }