feat: handling the case where "node" is used for tool-versions file. (#…

…812)
actions · Jul 18, 2023 · ca2d4e0 · ca2d4e0
1 parent c7a93de
commit ca2d4e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
@@ -158,7 +158,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version-file: [.nvmrc, .tool-versions, package.json]
+        node-version-file:
+          [.nvmrc, .tool-versions, .tool-versions-node, package.json]
     steps:
       - uses: actions/checkout@v3
       - name: Remove volta from package.json

diff --git a/__tests__/data/.tool-versions-node b/__tests__/data/.tool-versions-node
@@ -0,0 +1 @@
+node 14.0.0
diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -60754,7 +60754,7 @@ function parseNodeVersionFile(contents) {
         core.info('Node version file is not JSON file');
     }
     if (!nodeVersion) {
-        const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+        const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
         nodeVersion = (_c = found === null || found === void 0 ? void 0 : found.groups) === null || _c === void 0 ? void 0 : _c.version;
     }
     // In the case of an unknown format,

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -72336,7 +72336,7 @@ function parseNodeVersionFile(contents) {
         core.info('Node version file is not JSON file');
     }
     if (!nodeVersion) {
-        const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+        const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
         nodeVersion = (_c = found === null || found === void 0 ? void 0 : found.groups) === null || _c === void 0 ? void 0 : _c.version;
     }
     // In the case of an unknown format,

diff --git a/src/util.ts b/src/util.ts
@@ -13,7 +13,7 @@ export function parseNodeVersionFile(contents: string): string {
   }
 
   if (!nodeVersion) {
-    const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+    const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
     nodeVersion = found?.groups?.version;
   }