diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 54fe296b..0bdc0310 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -87889,12 +87889,13 @@ function isCacheFeatureAvailable() { exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; - const javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - // if (versionFile == '.tool-versions') { - // javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - // } else { - // javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; - // } + let javaVersionRegExp; + if (versionFile == '.tool-versions') { + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; + } + else { + javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + } const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version) ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version : ''; diff --git a/dist/setup/index.js b/dist/setup/index.js index 66091b9f..2936d56d 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125263,12 +125263,13 @@ function isCacheFeatureAvailable() { exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; - const javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - // if (versionFile == '.tool-versions') { - // javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - // } else { - // javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; - // } + let javaVersionRegExp; + if (versionFile == '.tool-versions') { + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; + } + else { + javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + } const fileContent = ((_b = (_a = content.match(javaVersionRegExp)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.version) ? (_d = (_c = content.match(javaVersionRegExp)) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.version : ''; diff --git a/src/util.ts b/src/util.ts index 7f792080..a4c77faa 100644 --- a/src/util.ts +++ b/src/util.ts @@ -118,13 +118,12 @@ export function getVersionFromFileContent( distributionName: string, versionFile: string ): string | null { - const javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - - // if (versionFile == '.tool-versions') { - // javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; - // } else { - // javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; - // } + let javaVersionRegExp: RegExp; + if (versionFile == '.tool-versions') { + javaVersionRegExp = /^java\s+(?:\S+-)?v?(?[^\s]+)$/m; + } else { + javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; + } const fileContent = content.match(javaVersionRegExp)?.groups?.version ? (content.match(javaVersionRegExp)?.groups?.version as string)