patch to extract filename from other directories

actions · Mar 14, 2024 · ae77984 · ae77984
1 parent a847c75
commit ae77984
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
-    else if (versionFile == '.java-version') {
+    else if (versionFileName == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
     else {

diff --git 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?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
-    else if (versionFile == '.java-version') {
+    else if (versionFileName == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
     else {

diff --git 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?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
-  } else if (versionFile == '.java-version') {
+  } else if (versionFileName == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {
     throw new Error('Invalid version file');