julia-actions/setup-julia
1
0
Fork 0
mirror of https://github.com/julia-actions/setup-julia.git synced 2026-02-12 02:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor getJuliaVersion to make it testable

Browse Source
This commit is contained in:
Sascha Mann
2019-10-04 00:21:58 +02:00
parent dc7dce0a2d
commit 16c0aaf600
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/installer.js generated
View File

@@ -53,15 +53,15 @@ function getJuliaReleases() {
}); });
}); });
} }
function getJuliaVersion(versionInput) { exports.getJuliaReleases = getJuliaReleases;
function getJuliaVersion(availableReleases, versionInput) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (semver.valid(versionInput) == versionInput) { if (semver.valid(versionInput) == versionInput) {
// versionInput is a valid version, use it directly // versionInput is a valid version, use it directly
return versionInput; return versionInput;
} }
// Use the highest available version that matches versionInput // Use the highest available version that matches versionInput
const releases = yield getJuliaReleases(); let version = semver.maxSatisfying(availableReleases, versionInput);
let version = semver.maxSatisfying(releases, versionInput);
if (version == null) { if (version == null) {
throw `Could not find a Julia version that matches ${versionInput}`; throw `Could not find a Julia version that matches ${versionInput}`;
} }

3
lib/setup-julia.js generated
View File

@@ -25,7 +25,8 @@ function run() {
try { try {
const versionInput = core.getInput('version'); const versionInput = core.getInput('version');
const arch = core.getInput('arch'); 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}`); core.debug(`selected Julia version: ${arch}/${version}`);
// Search in cache // Search in cache
let juliaPath; let juliaPath;

7
src/installer.ts
View File

@@ -12,7 +12,7 @@ import * as semver from 'semver'
const osPlat = os.platform() // possible values: win32 (Windows), linux (Linux), darwin (macOS) const osPlat = os.platform() // possible values: win32 (Windows), linux (Linux), darwin (macOS)
core.debug(`platform: ${osPlat}`) core.debug(`platform: ${osPlat}`)
async function getJuliaReleases(): Promise<string[]> { export async function getJuliaReleases(): Promise<string[]> {
// Wrap everything in a Promise so that it can be called with await. // Wrap everything in a Promise so that it can be called with await.
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const options = { const options = {
@@ -42,15 +42,14 @@ async function getJuliaReleases(): Promise<string[]> {
}) })
} }
export async function getJuliaVersion(versionInput: string): Promise<string> { export async function getJuliaVersion(availableReleases: string[], versionInput: string): Promise<string> {
if (semver.valid(versionInput) == versionInput) { if (semver.valid(versionInput) == versionInput) {
// versionInput is a valid version, use it directly // versionInput is a valid version, use it directly
return versionInput return versionInput
} }
// Use the highest available version that matches versionInput // Use the highest available version that matches versionInput
const releases = await getJuliaReleases() let version = semver.maxSatisfying(availableReleases, versionInput)
let version = semver.maxSatisfying(releases, versionInput)
if (version == null) { if (version == null) {
throw `Could not find a Julia version that matches ${versionInput}` throw `Could not find a Julia version that matches ${versionInput}`
} }

3
src/setup-julia.ts
View File

@@ -10,7 +10,8 @@ async function run() {
try { try {
const versionInput = core.getInput('version') const versionInput = core.getInput('version')
const arch = core.getInput('arch') 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}`) core.debug(`selected Julia version: ${arch}/${version}`)
// Search in cache // Search in cache