mirror of
https://github.com/actions/setup-node
synced 2024-11-09 23:22:41 +00:00
Only include npm version if npm exists
This commit is contained in:
parent
e99a7e62b2
commit
ffde538781
2 changed files with 10 additions and 4 deletions
7
dist/index.js
vendored
7
dist/index.js
vendored
|
@ -15228,8 +15228,11 @@ function run() {
|
|||
const nodeVersion = child_process_1.default.execSync(`${nodePath} --version`);
|
||||
console.log(`Node Version: ${nodeVersion}`);
|
||||
const npmPath = yield io.which('npm');
|
||||
const npmVersion = child_process_1.default.execSync(`${npmPath} --version`);
|
||||
console.log(`npm Version: ${npmVersion}`);
|
||||
// Older versions of Node don't include npm
|
||||
if (npmPath) {
|
||||
const npmVersion = child_process_1.default.execSync(`${npmPath} --version`);
|
||||
console.log(`npm Version: ${npmVersion}`);
|
||||
}
|
||||
const registryUrl = core.getInput('registry-url');
|
||||
const alwaysAuth = core.getInput('always-auth');
|
||||
if (registryUrl) {
|
||||
|
|
|
@ -25,8 +25,11 @@ async function run() {
|
|||
console.log(`Node Version: ${nodeVersion}`);
|
||||
|
||||
const npmPath = await io.which('npm');
|
||||
const npmVersion = cp.execSync(`${npmPath} --version`);
|
||||
console.log(`npm Version: ${npmVersion}`);
|
||||
// Older versions of Node don't include npm
|
||||
if (npmPath) {
|
||||
const npmVersion = cp.execSync(`${npmPath} --version`);
|
||||
console.log(`npm Version: ${npmVersion}`);
|
||||
}
|
||||
|
||||
const registryUrl: string = core.getInput('registry-url');
|
||||
const alwaysAuth: string = core.getInput('always-auth');
|
||||
|
|
Loading…
Reference in a new issue