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

.github/workflows/versions.yml

@@ -27,28 +27,22 @@ jobs:
       - name: Setup node 11 from dist
         uses: ./
         with:
-          node-version: ${{ matrix.node-version }}
-          check-latest: true
-      - if: runner.os != 'Windows'
-        name: Verify node and npm
+          node-version: 11
+      - name: Verify node and npm
         run: |
-          . "$NVM_DIR/nvm.sh"
-          [[ $(nvm version-remote "${{ matrix.node-version }}") =~ ^v([^.]+) ]]
-          __tests__/verify-node.sh "${BASH_REMATCH[1]}"
+          canaryVersion="${{ matrix.node-version }}"
+          majorVersion=$(echo $canaryVersion | cut -d- -f1)
+          __tests__/verify-node.sh "$majorVersion"
         shell: bash
 
-  v8-canary-syntax:
+  nightly-syntax:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         node-version:
-          [
-            '20-v8-canary',
-            '20.0.0-v8-canary',
-            '20.0.0-v8-canary20221101e50e45c9f8'
-          ]
+          [16.0.0-nightly20210420a0261d231c, 17-nightly, 18.0.0-nightly]
     steps:
       - uses: actions/checkout@v3
       - name: Setup Node
@@ -56,19 +50,175 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Verify node and npm
-        run: __tests__/verify-node.sh 11
+        run: |
+          nightlyVersion="${{ matrix.node-version }}"
+          majorVersion=$(echo $nightlyVersion | cut -d- -f1)
+          __tests__/verify-node.sh "$majorVersion"
+        shell: bash
+
+  rc-syntax:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [16.0.0-rc.1, 18.0.0-rc.2, 19.0.0-rc.0]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Node
+        uses: ./
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Verify node and npm
+        run: |
+          rcVersion="${{ matrix.node-version }}"
+          majorVersion=$(echo $rcVersion | cut -d- -f1)
+          __tests__/verify-node.sh "$majorVersion"
+        shell: bash
+
+  manifest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [10.15, 12.16.0, 14.2.0, 16.3.0]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Node
+        uses: ./
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Verify node and npm
+        run: __tests__/verify-node.sh "${{ matrix.node-version }}"
+        shell: bash
+
+  check-latest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [10, 12, 14]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Node and check latest
+        uses: ./
+        with:
+          node-version: ${{ matrix.node-version }}
+          check-latest: true
+      - name: Verify node and npm
+        run: __tests__/verify-node.sh "${{ matrix.node-version }}"
+        shell: bash
+
+  version-file:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version-file: [.nvmrc, .tool-versions, package.json]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Remove volta from package.json
+        shell: bash
+        run: cat <<< "$(jq 'del(.volta)' ./__tests__/data/package.json)" > ./__tests__/data/package.json
+      - name: Setup node from node version file
+        uses: ./
+        with:
+          node-version-file: '__tests__/data/${{ matrix.node-version-file }}'
+      - name: Verify node
+        run: __tests__/verify-node.sh 14
+
+  version-file-volta:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup node from node version file
+        uses: ./
+        with:
+          node-version-file: '__tests__/data/package.json'
+      - name: Verify node
+        run: __tests__/verify-node.sh 16
+
+  node-dist:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [11, 13]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Node from dist
+        uses: ./
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Verify node and npm
+        run: __tests__/verify-node.sh "${{ matrix.node-version }}"
+        shell: bash
+
+  old-versions:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v3
       # test old versions which didn't have npm and layout different
       - name: Setup node 0.12.18 from dist
         uses: ./
         with:
           node-version: 0.12.18
       - name: Verify node
-        shell: bash
         run: __tests__/verify-node.sh 0.12.18 SKIP_NPM
-      # test version from node manifest
-      - name: Setup node 12.16.2 from manifest
+        shell: bash
+
+  arch:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup node 14 x86 from dist
         uses: ./
         with:
-          node-version: 12.16.2
-      - name: Verify node and npm
-        run: __tests__/verify-node.sh 12
+          node-version: '14'
+          architecture: 'x86'
+      - name: Verify node
+        run: __tests__/verify-arch.sh "ia32"
+        shell: bash
+
+  node-latest-aliases:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [current, latest, node]
+    steps:
+      - name: Get node version
+        run: |
+          latestNodeVersion=$(curl https://nodejs.org/dist/index.json | jq -r '. [0].version')
+          echo "LATEST_NODE_VERSION=$latestNodeVersion" >> $GITHUB_OUTPUT
+        id: version
+        shell: bash
+      - uses: actions/checkout@v3
+      - name: Setup Node
+        uses: ./
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Retrieve version after install
+        run: |
+          updatedVersion=$(echo $(node --version))
+          echo "NODE_VERSION_UPDATED=$updatedVersion" >> $GITHUB_OUTPUT
+        id: updatedVersion
+        shell: bash
+      - name: Compare versions
+        if: ${{ steps.version.outputs.LATEST_NODE_VERSION != steps.updatedVersion.outputs.NODE_VERSION_UPDATED}}
+        run: |
+          echo "Latest node version failed to download."
+          exit 1

action.yml

@@ -1,7 +1,13 @@
+<<<<<<< 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'
->>>>>>> Stashed changes
->>>>>>> Stashed changes
+description: 'Setup a Node.js environment and add it to the PATH, additionally providing proxy support'
 author: 'GitHub'
 inputs:
   always-auth:
@@ -28,8 +34,12 @@ inputs:
 <<<<<<< 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.
-    default: ${{ github.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.'
 # 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
 >>>>>>> Stashed changes

package.json

@@ -35,18 +35,11 @@
     "@types/jest": "^24.0.13",
     "@types/node": "^12.0.4",
     "@types/semver": "^6.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
-    "@vercel/ncc": "^0.33.4",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-node": "^11.1.0",
-    "jest": "^27.2.5",
-    "jest-circus": "^27.2.5",
-    "jest-each": "^27.2.5",
-    "prettier": "^2.8.4",
-    "ts-jest": "^27.0.5",
-    "typescript": "^4.2.3"
+    "@zeit/ncc": "^0.21.0",
+    "jest": "^24.9.0",
+    "jest-circus": "^24.7.1",
+    "prettier": "^1.19.1",
+    "ts-jest": "^24.3.0",
+    "typescript": "^3.8.3"
   }
 }