Merge remote-tracking branch 'origin/ethomson/update_description'

action.yml

@@ -1,39 +1,59 @@
+<<<<<<< Updated upstream
+name: 'Setup Node.js'
+description: 'Set up a specific version of Node.js and add the command-line tools to the PATH'
+=======
+<<<<<<< Updated upstream
+name: 'Setup Node.js'
+description: 'Set up a specific version of Node.js and add the command-line tools to the PATH'
+=======
 name: 'Setup Node.js environment'
-description: 'Setup a Node.js environment by adding problem matchers and optionally downloading and adding it to the PATH.'
+description: 'Setup a Node.js environment by adding problem matchers and optionally downloading and adding it to the PATH'
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 author: 'GitHub'
 inputs:
   always-auth:
-    description: 'Set always-auth in npmrc.'
+    description: 'Set always-auth in npmrc'
     default: 'false'
   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, .tool-versions.'
-  architecture:
-    description: 'Target architecture for Node to use. Examples: x86, x64. Will use system architecture by default.'
-  check-latest:
-    description: 'Set this option if you want the action to check for the latest available version that satisfies the version spec.'
-    default: false
+<<<<<<< Updated upstream
+    description: 'Version Spec of the version to use.  Examples: 10.x, 10.15.1, >=10.15.0'
+    default: '10.x'
+=======
+<<<<<<< Updated upstream
+    description: 'Version Spec of the version to use.  Examples: 10.x, 10.15.1, >=10.15.0'
+    default: '10.x'
+=======
+    description: 'Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0'
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
   registry-url:
-    description: 'Optional registry to set up for auth. Will set the registry in a project level .npmrc and .yarnrc file, and set up auth to read in from env.NODE_AUTH_TOKEN.'
+    description: 'Optional registry to set up for auth. Will set the registry in a project level .npmrc and .yarnrc file, and set up auth to read in from env.NODE_AUTH_TOKEN'
   scope:
-    description: 'Optional scope for authenticating against scoped registries. Will fall back to the repository owner when using the GitHub Packages registry (https://npm.pkg.github.com/).'
+    description: 'Optional scope for authenticating against scoped registries'
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
   token:
-    description: Used to pull node distributions from node-versions. Since there's a default, this is typically not supplied by the user. When running this action on github.com, the default value is sufficient. When running on GHES, you can pass a personal access token for github.com if you are experiencing rate limiting.
-    default: ${{ github.server_url == 'https://github.com' && github.token || '' }}
-  cache:
-    description: 'Used to specify a package manager for caching in the default directory. Supported values: npm, yarn, pnpm.'
-  cache-dependency-path:
-    description: 'Used to specify the path to a dependency file: package-lock.json, yarn.lock, etc. Supports wildcards or a list of file names for caching multiple dependencies.'
+    description: Used to pull node distributions from node-versions.  Since there's a default, this is typically not supplied by the user.
+    default: ${{ github.token }}
 # TODO: add input to control forcing to pull from cloud or dist. 
 #       escape valve for someone having issues or needing the absolute latest which isn't cached yet
-outputs:
-  cache-hit: 
-    description: 'A boolean value to indicate if a cache was hit.'
-  node-version:
-    description: 'The installed node version.'
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
+# Deprecated option, do not use. Will not be supported after October 1, 2019
+  version:
+    description: 'Deprecated. Use node-version instead. Will not be supported after October 1, 2019'
+    deprecationMessage: 'The version property will not be supported after October 1, 2019. Use node-version instead'
 runs:
-  using: 'node16'
-  main: 'dist/setup/index.js'
-  post: 'dist/cache-save/index.js'
-  post-if: success()
+  using: 'node12'
+<<<<<<< Updated upstream
+  main: 'lib/setup-node.js'
+=======
+<<<<<<< Updated upstream
+  main: 'lib/setup-node.js'
+=======
+  main: 'dist/index.js'
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes