Add support for asdf format as Node.js version file

ganta · ganta · commit dbb64ac1d11f · 2022-05-30T20:13:04.000+09:00
diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
@@ -84,12 +84,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version-file: [.nvmrc, .tool-versions]
     steps:
       - uses: actions/checkout@v3
       - name: Setup node from node version file
         uses: ./
         with:
-          node-version-file: '__tests__/data/.nvmrc'
+          node-version-file: '__tests__/data/${{ matrix.node-version-file }}'
       - name: Verify node
         run: __tests__/verify-node.sh 14
 
diff --git a/__tests__/data/.tool-versions b/__tests__/data/.tool-versions
@@ -0,0 +1 @@
+nodejs 14.0.0
diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts
@@ -946,15 +946,17 @@ describe('setup-node', () => {
 describe('helper methods', () => {
   describe('parseNodeVersionFile', () => {
     each`
-      contents            | expected
-      ${'12'}             | ${'12'}
-      ${'12.3'}           | ${'12.3'}
-      ${'12.3.4'}         | ${'12.3.4'}
-      ${'v12.3.4'}        | ${'12.3.4'}
-      ${'lts/erbium'}     | ${'lts/erbium'}
-      ${'lts/*'}          | ${'lts/*'}
-      ${''}               | ${''}
-      ${'unknown format'} | ${'unknown format'}
+      contents                                     | expected
+      ${'12'}                                      | ${'12'}
+      ${'12.3'}                                    | ${'12.3'}
+      ${'12.3.4'}                                  | ${'12.3.4'}
+      ${'v12.3.4'}                                 | ${'12.3.4'}
+      ${'lts/erbium'}                              | ${'lts/erbium'}
+      ${'lts/*'}                                   | ${'lts/*'}
+      ${'nodejs 12.3.4'}                           | ${'12.3.4'}
+      ${'ruby 2.3.4\nnodejs 12.3.4\npython 3.4.5'} | ${'12.3.4'}
+      ${''}                                        | ${''}
+      ${'unknown format'}                          | ${'unknown format'}
     `.it('parses "$contents"', ({contents, expected}) => {
       expect(im.parseNodeVersionFile(contents)).toBe(expected);
     });
diff --git a/action.yml b/action.yml
@@ -8,7 +8,7 @@ inputs:
   node-version:
     description: 'Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0.'
   node-version-file:
-    description: 'File containing the version Spec of the version to use.  Examples: .nvmrc, .node-version.'
+    description: 'File containing the version Spec of the version to use.  Examples: .nvmrc, .node-version, .tool-versions.'
   architecture:
     description: 'Target architecture for Node to use. Examples: x86, x64. Will use system architecture by default.'
   check-latest:
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -70963,11 +70963,15 @@ function translateArchToDistUrl(arch) {
     }
 }
 function parseNodeVersionFile(contents) {
-    let nodeVersion = contents.trim();
-    if (/^v\d/.test(nodeVersion)) {
-        nodeVersion = nodeVersion.substring(1);
-    }
-    return nodeVersion;
+    var _a;
+    const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+    const nodeVersion = (_a = found === null || found === void 0 ? void 0 : found.groups) === null || _a === void 0 ? void 0 : _a.version;
+    if (nodeVersion) {
+        return nodeVersion;
+    }
+    // In the case of an unknown format,
+    // return as is and evaluate the version separately.
+    return contents.trim();
 }
 exports.parseNodeVersionFile = parseNodeVersionFile;
 function isLatestSyntax(versionSpec) {
diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md
@@ -56,7 +56,7 @@ steps:
 
 ## Node version file
 
-The `node-version-file` input accepts a path to a file containing the version of Node.js to be used by a project, for example `.nvmrc` or `.node-version`. If both the `node-version` and the `node-version-file` inputs are provided then the `node-version` input is used.
+The `node-version-file` input accepts a path to a file containing the version of Node.js to be used by a project, for example `.nvmrc`, `.node-version` or `.tool-versions`. If both the `node-version` and the `node-version-file` inputs are provided then the `node-version` input is used.
 See [supported version syntax](https://github.com/actions/setup-node#supported-version-syntax)
 > The action will search for the node version file relative to the repository root.
 
diff --git a/src/installer.ts b/src/installer.ts
@@ -487,12 +487,16 @@ function translateArchToDistUrl(arch: string): string {
 }
 
 export function parseNodeVersionFile(contents: string): string {
-  let nodeVersion = contents.trim();
+  const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+  const nodeVersion = found?.groups?.version;
 
-  if (/^v\d/.test(nodeVersion)) {
-    nodeVersion = nodeVersion.substring(1);
+  if (nodeVersion) {
+    return nodeVersion;
   }
-  return nodeVersion;
+
+  // In the case of an unknown format,
+  // return as is and evaluate the version separately.
+  return contents.trim();
 }
 
 function isLatestSyntax(versionSpec): boolean {

Original file line number	Diff line number	Diff line change
`@@ -487,12 +487,16 @@ function translateArchToDistUrl(arch: string): string {`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`export function parseNodeVersionFile(contents: string): string {`
`490`		`- let nodeVersion = contents.trim();`
	`490`	`+ const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);`
	`491`	`+ const nodeVersion = found?.groups?.version;`
`491`	`492`
`492`		`- if (/^v\d/.test(nodeVersion)) {`
`493`		`- nodeVersion = nodeVersion.substring(1);`
	`493`	`+ if (nodeVersion) {`
	`494`	`+ return nodeVersion;`
`494`	`495`	`}`
`495`		`- return nodeVersion;`
	`496`	`+`
	`497`	`+ // In the case of an unknown format,`
	`498`	`+ // return as is and evaluate the version separately.`
	`499`	`+ return contents.trim();`
`496`	`500`	`}`
`497`	`501`
`498`	`502`	`function isLatestSyntax(versionSpec): boolean {`