From a847c7571985f4de4e2a462d667607e348cf95f3 Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Thu, 14 Mar 2024 14:39:38 +0530 Subject: [PATCH] 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 fc0b1d19..62db4e58 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 55a09649..0b90b84c 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 e02cea6d..0497cec3 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;