diff --git a/lib/installer.js b/lib/installer.js index 3bd818d..6c7caec 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -53,15 +53,15 @@ function getJuliaReleases() { }); }); } -function getJuliaVersion(versionInput) { +exports.getJuliaReleases = getJuliaReleases; +function getJuliaVersion(availableReleases, versionInput) { return __awaiter(this, void 0, void 0, function* () { if (semver.valid(versionInput) == versionInput) { // versionInput is a valid version, use it directly return versionInput; } // Use the highest available version that matches versionInput - const releases = yield getJuliaReleases(); - let version = semver.maxSatisfying(releases, versionInput); + let version = semver.maxSatisfying(availableReleases, versionInput); if (version == null) { throw `Could not find a Julia version that matches ${versionInput}`; } diff --git a/lib/setup-julia.js b/lib/setup-julia.js index 6b7b976..ed8f598 100644 --- a/lib/setup-julia.js +++ b/lib/setup-julia.js @@ -25,7 +25,8 @@ function run() { try { const versionInput = core.getInput('version'); const arch = core.getInput('arch'); - const version = yield installer.getJuliaVersion(versionInput); + const availableReleases = yield installer.getJuliaReleases(); + const version = yield installer.getJuliaVersion(availableReleases, versionInput); core.debug(`selected Julia version: ${arch}/${version}`); // Search in cache let juliaPath; diff --git a/src/installer.ts b/src/installer.ts index fed052d..427f021 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -12,7 +12,7 @@ import * as semver from 'semver' const osPlat = os.platform() // possible values: win32 (Windows), linux (Linux), darwin (macOS) core.debug(`platform: ${osPlat}`) -async function getJuliaReleases(): Promise { +export async function getJuliaReleases(): Promise { // Wrap everything in a Promise so that it can be called with await. return new Promise((resolve, reject) => { const options = { @@ -42,15 +42,14 @@ async function getJuliaReleases(): Promise { }) } -export async function getJuliaVersion(versionInput: string): Promise { +export async function getJuliaVersion(availableReleases: string[], versionInput: string): Promise { if (semver.valid(versionInput) == versionInput) { // versionInput is a valid version, use it directly return versionInput } // Use the highest available version that matches versionInput - const releases = await getJuliaReleases() - let version = semver.maxSatisfying(releases, versionInput) + let version = semver.maxSatisfying(availableReleases, versionInput) if (version == null) { throw `Could not find a Julia version that matches ${versionInput}` } diff --git a/src/setup-julia.ts b/src/setup-julia.ts index 1225c80..5dd4a2e 100644 --- a/src/setup-julia.ts +++ b/src/setup-julia.ts @@ -10,7 +10,8 @@ async function run() { try { const versionInput = core.getInput('version') const arch = core.getInput('arch') - const version = await installer.getJuliaVersion(versionInput) + const availableReleases = await installer.getJuliaReleases() + const version = await installer.getJuliaVersion(availableReleases, versionInput) core.debug(`selected Julia version: ${arch}/${version}`) // Search in cache