actions/setup-node
1
0
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2026-08-22 08:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify action metadata version parsing

Browse Source
This commit is contained in:
Jesse Donat 2026-07-26 22:53:25 -05:00
parent a0ff657b74
commit 00e6f76a61
3 changed files with 11 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dist/cache-save/index.js vendored
View File

@ -92709,36 +92709,9 @@ function getNodeVersionFromFile(versionFilePath) {
catch { catch {
core.info('Node version file is not JSON file'); core.info('Node version file is not JSON file');
} }
const nodePrefix = 'node'; const actionYmlNodeVersion = contents.match(/^\s+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m);
let inRunsSection = false; if (actionYmlNodeVersion) {
for (const line of contents.split(/\r?\n/)) { return actionYmlNodeVersion.groups?.version ?? null;
const trimmedLine = line.trim();
if (!inRunsSection) {
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (separatorIndex <= 0 ||
trimmedLine.slice(0, separatorIndex) !== 'using') {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if ((runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))) {
runtime = runtime.slice(1, -1);
}
if (runtime.startsWith(nodePrefix) &&
/^\d+$/.test(runtime.slice(nodePrefix.length))) {
return runtime.slice(nodePrefix.length);
}
} }
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m); const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
return found?.groups?.version ?? contents.trim(); return found?.groups?.version ?? contents.trim();

33
dist/setup/index.js vendored
View File

@ -98103,36 +98103,9 @@ function getNodeVersionFromFile(versionFilePath) {
catch { catch {
core_info('Node version file is not JSON file'); core_info('Node version file is not JSON file');
} }
const nodePrefix = 'node'; const actionYmlNodeVersion = contents.match(/^\s+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m);
let inRunsSection = false; if (actionYmlNodeVersion) {
for (const line of contents.split(/\r?\n/)) { return actionYmlNodeVersion.groups?.version ?? null;
const trimmedLine = line.trim();
if (!inRunsSection) {
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (separatorIndex <= 0 ||
trimmedLine.slice(0, separatorIndex) !== 'using') {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if ((runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))) {
runtime = runtime.slice(1, -1);
}
if (runtime.startsWith(nodePrefix) &&
/^\d+$/.test(runtime.slice(nodePrefix.length))) {
return runtime.slice(nodePrefix.length);
}
} }
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m); const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
return found?.groups?.version ?? contents.trim(); return found?.groups?.version ?? contents.trim();

44
src/util.ts
View File

@ -68,45 +68,11 @@ export function getNodeVersionFromFile(versionFilePath: string): string | null {
core.info('Node version file is not JSON file'); core.info('Node version file is not JSON file');
} }
const nodePrefix = 'node'; const actionYmlNodeVersion = contents.match(
let inRunsSection = false; /^\s+using:\s*['"]?node(?<version>\d+)['"]?\s*(?:#.*)?$/m
for (const line of contents.split(/\r?\n/)) { );
const trimmedLine = line.trim(); if (actionYmlNodeVersion) {
if (!inRunsSection) { return actionYmlNodeVersion.groups?.version ?? null;
inRunsSection =
trimmedLine === 'runs:' || trimmedLine.startsWith('runs: #');
continue;
}
if (!trimmedLine || trimmedLine.startsWith('#')) {
continue;
}
if (!line.match(/^\s/)) {
break;
}
const separatorIndex = trimmedLine.indexOf(':');
if (
separatorIndex <= 0 ||
trimmedLine.slice(0, separatorIndex) !== 'using'
) {
continue;
}
let runtime = trimmedLine.slice(separatorIndex + 1).trim();
runtime = runtime.split('#', 1)[0].trim();
if (
(runtime.startsWith("'") && runtime.endsWith("'")) ||
(runtime.startsWith('"') && runtime.endsWith('"'))
) {
runtime = runtime.slice(1, -1);
}
if (
runtime.startsWith(nodePrefix) &&
/^\d+$/.test(runtime.slice(nodePrefix.length))
) {
return runtime.slice(nodePrefix.length);
}
} }
const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m); const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);