From 65270bbd5582032571746d4c5531670130448195 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 25 Oct 2022 21:08:55 +0200 Subject: [PATCH] add fixes --- dist/setup/index.js | 2 +- src/installer.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index be116782..a39bcda2 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -73440,7 +73440,7 @@ function evaluateNightlyVersions(versions, versionSpec) { if (range) { versions.sort((a, b) => +semver.lt(a, b) - 0.5); for (const currentVersion of versions) { - const satisfied = semver.satisfies(currentVersion.replace('-nightly', '-nightly.'), range, { includePrerelease: true }); + const satisfied = semver.satisfies(currentVersion.replace('-nightly', '-nightly.'), range, { includePrerelease: true }) && currentVersion.includes('nightly'); if (satisfied) { version = currentVersion; break; diff --git a/src/installer.ts b/src/installer.ts index 51af3357..37bb7ce8 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -385,11 +385,12 @@ function evaluateNightlyVersions( if (range) { versions.sort((a, b) => +semver.lt(a, b) - 0.5); for (const currentVersion of versions) { - const satisfied: boolean = semver.satisfies( - currentVersion.replace('-nightly', '-nightly.'), - range, - {includePrerelease: true} - ); + const satisfied: boolean = + semver.satisfies( + currentVersion.replace('-nightly', '-nightly.'), + range, + {includePrerelease: true} + ) && currentVersion.includes('nightly'); if (satisfied) { version = currentVersion; break;