From a847c7571985f4de4e2a462d667607e348cf95f3 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 14:39:38 +0530 Subject: [PATCH 1/4] patch to extract file from other location --- dist/cleanup/index.js | 5 +++++ dist/setup/index.js | 5 +++++ src/util.ts | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index fc0b1d199..62db4e58e 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -88355,6 +88355,11 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; + const path = __nccwpck_require__(1017); + function getFileName(versionFile) { + return path.basename(versionFile); + } + const versionFileName = getFileName(versionFile); if (versionFile == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; diff --git a/dist/setup/index.js b/dist/setup/index.js index 55a096494..0b90b84c7 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125729,6 +125729,11 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; + const path = __nccwpck_require__(71017); + function getFileName(versionFile) { + return path.basename(versionFile); + } + const versionFileName = getFileName(versionFile); if (versionFile == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; diff --git a/src/util.ts b/src/util.ts index e02cea6d9..0497cec31 100644 --- a/src/util.ts +++ b/src/util.ts @@ -119,6 +119,13 @@ export function getVersionFromFileContent( versionFile: string ): string | null { let javaVersionRegExp: RegExp; + const path = require('path'); + + function getFileName(versionFile: string) { + return path.basename(versionFile); + } + + const versionFileName = getFileName(versionFile); if (versionFile == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; From ae77984eef13e4fc9cd5c09b2c89857db0a2a7c1 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 14:46:42 +0530 Subject: [PATCH 2/4] patch to extract filename from other directories --- dist/cleanup/index.js | 4 ++-- dist/setup/index.js | 4 ++-- src/util.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 62db4e58e..c44973178 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -88360,11 +88360,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) { return path.basename(versionFile); } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFile == '.java-version') { + else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { diff --git a/dist/setup/index.js b/dist/setup/index.js index 0b90b84c7..b084850e1 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125734,11 +125734,11 @@ function getVersionFromFileContent(content, distributionName, versionFile) { return path.basename(versionFile); } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFile == '.java-version') { + else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { diff --git a/src/util.ts b/src/util.ts index 0497cec31..861461737 100644 --- a/src/util.ts +++ b/src/util.ts @@ -126,10 +126,10 @@ export function getVersionFromFileContent( } const versionFileName = getFileName(versionFile); - if (versionFile == '.tool-versions') { + if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; - } else if (versionFile == '.java-version') { + } else if (versionFileName == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { throw new Error('Invalid version file'); From 0b8af766df9bd30423ccf40124478d4b42fdab3b Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 16:38:31 +0530 Subject: [PATCH 3/4] removed code failing checks --- dist/cleanup/index.js | 3 +-- dist/setup/index.js | 3 +-- src/util.ts | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index c44973178..3b626d649 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -88355,9 +88355,8 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; - const path = __nccwpck_require__(1017); function getFileName(versionFile) { - return path.basename(versionFile); + return path_1.default.basename(versionFile); } const versionFileName = getFileName(versionFile); if (versionFileName == '.tool-versions') { diff --git a/dist/setup/index.js b/dist/setup/index.js index b084850e1..5c9f40a48 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125729,9 +125729,8 @@ exports.isCacheFeatureAvailable = isCacheFeatureAvailable; function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; - const path = __nccwpck_require__(71017); function getFileName(versionFile) { - return path.basename(versionFile); + return path_1.default.basename(versionFile); } const versionFileName = getFileName(versionFile); if (versionFileName == '.tool-versions') { diff --git a/src/util.ts b/src/util.ts index 861461737..7cdf73523 100644 --- a/src/util.ts +++ b/src/util.ts @@ -119,7 +119,6 @@ export function getVersionFromFileContent( versionFile: string ): string | null { let javaVersionRegExp: RegExp; - const path = require('path'); function getFileName(versionFile: string) { return path.basename(versionFile); From d265fde39f3fca6ef02561684841283f8df5338a Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 18:52:48 +0530 Subject: [PATCH 4/4] changed the validation for .java-version type --- dist/cleanup/index.js | 5 +---- dist/setup/index.js | 5 +---- src/util.ts | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 3b626d649..c90128bb6 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -88363,11 +88363,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFileName == '.java-version') { - javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; - } else { - throw new Error('Invalid version file'); + 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 5c9f40a48..13023489c 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125737,11 +125737,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } - else if (versionFileName == '.java-version') { - javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; - } else { - throw new Error('Invalid version file'); + 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 7cdf73523..034fc83d4 100644 --- a/src/util.ts +++ b/src/util.ts @@ -128,10 +128,8 @@ export function getVersionFromFileContent( if (versionFileName == '.tool-versions') { javaVersionRegExp = /^(java\s+)(?:\S*-)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; - } else if (versionFileName == '.java-version') { - javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else { - throw new Error('Invalid version file'); + javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } const fileContent = content.match(javaVersionRegExp)?.groups?.version