actions/setup-node
1
0
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2025-11-04 13:29:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: trim no matter what

Browse Source
This commit is contained in:
Jef LeCompte
2022-06-30 09:22:35 -07:00
parent d86a20eb78
commit 1c48dc5a9e
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/setup/index.js vendored
View File

@@ -71768,13 +71768,10 @@ function translateArchToDistUrl(arch) {
} }
} }
function parseNodeVersionFile(contents) { function parseNodeVersionFile(contents) {
let nodeVersion; let nodeVersion = contents.trim();
if (contents.includes('volta')) { if (contents.includes('volta')) {
nodeVersion = JSON.parse(contents).volta.node; nodeVersion = JSON.parse(contents).volta.node;
} }
else {
nodeVersion = contents.trim();
}
if (/^v\d/.test(nodeVersion)) { if (/^v\d/.test(nodeVersion)) {
nodeVersion = nodeVersion.substring(1); nodeVersion = nodeVersion.substring(1);
} }

5
src/installer.ts
View File

@@ -495,17 +495,16 @@ function translateArchToDistUrl(arch: string): string {
} }
export function parseNodeVersionFile(contents: string): string { export function parseNodeVersionFile(contents: string): string {
let nodeVersion; let nodeVersion = contents.trim();
if (contents.includes('volta')) { if (contents.includes('volta')) {
nodeVersion = JSON.parse(contents).volta.node; nodeVersion = JSON.parse(contents).volta.node;
} else {
nodeVersion = contents.trim();
} }
if (/^v\d/.test(nodeVersion)) { if (/^v\d/.test(nodeVersion)) {
nodeVersion = nodeVersion.substring(1); nodeVersion = nodeVersion.substring(1);
} }
return nodeVersion; return nodeVersion;
} }