Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
ehmicky committed Sep 12, 2021
1 parent b69ebe6 commit 4ae3867
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/combination/tasks/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export const loadRunner = async function ({
const {
spawn,
spawnOptions = {},
versions: runnerVersions,
versions,
} = await launchRunner({ id, runnerConfig, launch })
return { id, spawn, spawnOptions, runnerVersions, runnerConfig }
return { id, spawn, spawnOptions, versions, runnerConfig }
}

// Fire `runner.launch()`
Expand Down
12 changes: 6 additions & 6 deletions src/system/create/versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import { spawnProcess } from '../../utils/spawn.js'
// priority order in the unlikely case two runners return the properties in
// `versions`.
export const getSystemVersions = async function (combinations, cwd) {
const [runnersVersions, spydVersion] = await Promise.all([
const [versions, spydVersion] = await Promise.all([
getRunnersVersions(combinations, cwd),
getSpydVersion(),
])
return Object.assign({}, ...runnersVersions, { Spyd: spydVersion })
return Object.assign({}, ...versions, { Spyd: spydVersion })
}

// TODO: use static JSON imports once those are possible
Expand Down Expand Up @@ -54,17 +54,17 @@ const getRunnerId = function ({
const getRunnerVersions = async function (id, combinations, cwd) {
const {
dimensions: {
runner: { runnerVersions, spawnOptions },
runner: { versions, spawnOptions },
},
} = combinations.find(
(combination) => combination.dimensions.runner.id === id,
)
const runnerVersionsA = await Promise.all(
Object.entries(runnerVersions).map(([name, version]) =>
const versionsA = await Promise.all(
Object.entries(versions).map(([name, version]) =>
getRunnerVersion({ name, version, id, spawnOptions, cwd }),
),
)
return Object.assign({}, ...runnerVersionsA)
return Object.assign({}, ...versionsA)
}

const getRunnerVersion = async function ({
Expand Down

0 comments on commit 4ae3867

Please sign in to comment.