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