Actions/setup-node
1
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2025-11-04 01:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: add found cached toolpath to PATH before executing node

Browse Source
This commit is contained in:
Ben Sterling 2022-07-20 11:17:46 +01:00
parent df568f01a8
commit c4d0bc7f39
No known key found for this signature in database
GPG Key ID: 4A6610DCFFC78977
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/installer.test.ts
View File

@ -225,7 +225,7 @@ describe('setup-node', () => {
await main.run();
expect(logSpy).toHaveBeenCalledWith(
`Found v14.0.0 in cache @ ${toolPath} but it does not satisfy the requested version (12.16.2)`
`Found v14.0.0 in cache @ ${expPath} but it does not satisfy the requested version (12.16.2)`
);
expect(logSpy).toHaveBeenCalledWith(
`Attempting to download ${versionSpec}...`

17
src/installer.ts
View File

@ -82,18 +82,25 @@ export async function getNode(
if (toolPath) {
core.info(`Found in cache @ ${toolPath}`);
if (osPlat != 'win32') {
toolPath = path.join(toolPath, 'bin');
}
core.addPath(toolPath);
const {stdout: installedVersion} = await exec.getExecOutput(
'node',
['--version'],
{ignoreReturnCode: true}
);
if (!semver.satisfies(installedVersion, versionSpec)) {
core.info(
`Found ${installedVersion} in cache @ ${toolPath} but it does not satisfy the requested version (${versionSpec})`
);
toolPath = '';
if (semver.satisfies(installedVersion, versionSpec)) {
return;
}
core.info(
`Found ${installedVersion} in cache @ ${toolPath} but it does not satisfy the requested version (${versionSpec})`
);
toolPath = '';
}
if (!toolPath) {