actions
/
setup-node
Template
mirror of https://github.com/actions/setup-node
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only include npm version if npm exists

This commit is contained in:
Josh Gross 2020-04-21 11:21:23 -04:00
parent e99a7e62b2
commit ffde538781
No known key found for this signature in database
GPG Key ID: 17A6308EA2144978
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/index.js vendored
View File

@ -15228,8 +15228,11 @@ function run() {
const nodeVersion = child_process_1.default.execSync(`${nodePath} --version`); const nodeVersion = child_process_1.default.execSync(`${nodePath} --version`);
console.log(`Node Version: ${nodeVersion}`); console.log(`Node Version: ${nodeVersion}`);
const npmPath = yield io.which('npm'); const npmPath = yield io.which('npm');
const npmVersion = child_process_1.default.execSync(`${npmPath} --version`); // Older versions of Node don't include npm
console.log(`npm Version: ${npmVersion}`); if (npmPath) {
const npmVersion = child_process_1.default.execSync(`${npmPath} --version`);
console.log(`npm Version: ${npmVersion}`);
}
const registryUrl = core.getInput('registry-url'); const registryUrl = core.getInput('registry-url');
const alwaysAuth = core.getInput('always-auth'); const alwaysAuth = core.getInput('always-auth');
if (registryUrl) { if (registryUrl) {

7
src/setup-node.ts
View File

@ -25,8 +25,11 @@ async function run() {
console.log(`Node Version: ${nodeVersion}`); console.log(`Node Version: ${nodeVersion}`);
const npmPath = await io.which('npm'); const npmPath = await io.which('npm');
const npmVersion = cp.execSync(`${npmPath} --version`); // Older versions of Node don't include npm
console.log(`npm Version: ${npmVersion}`); if (npmPath) {
const npmVersion = cp.execSync(`${npmPath} --version`);
console.log(`npm Version: ${npmVersion}`);
}
const registryUrl: string = core.getInput('registry-url'); const registryUrl: string = core.getInput('registry-url');
const alwaysAuth: string = core.getInput('always-auth'); const alwaysAuth: string = core.getInput('always-auth');