Change zeit -> vercel due to name change

.gitattributes

@@ -1,5 +0,0 @@
-# Set default behavior to automatically normalize line endings, and force everything to be LF, except for Windows batch files that require CRLF, so that if a repo is accessed in Unix via a file share from Windows, the scripts will work.
-* text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf
-.licenses/** -diff linguist-generated=true

.github/tsc.json

@@ -4,13 +4,12 @@
             "owner": "tsc",
             "pattern": [
                 {
-                    "regexp": "^([^\\s].*)[\\(:](\\d+)[,:](\\d+)(?:\\):\\s+|\\s+-\\s+)(error|warning|info)\\s+TS(\\d+)\\s*:\\s*(.*)$",
+                    "regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
                     "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "severity": 4,
-                    "code": 5,
-                    "message": 6
+                    "location": 2,
+                    "severity": 3,
+                    "code": 4,
+                    "message": 5
                 }
             ]
         }

.github/workflows/build-test.yml

@@ -13,14 +13,14 @@ on:
       
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
       - name: Setup node 12
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
         with:
           node-version: 12.x
       - run: npm ci

.github/workflows/licensed.yml

@@ -1,20 +0,0 @@
-name: Licensed
-
-on:
-  push: {branches: main}
-  pull_request: {branches: main}
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: Check licenses
-    steps:
-      - uses: actions/checkout@v2
-      - run: npm ci
-      - name: Install licensed
-        run: |
-          cd $RUNNER_TEMP
-          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/2.12.2/licensed-2.12.2-linux-x64.tar.gz
-          sudo tar -xzf licensed.tar.gz
-          sudo mv licensed /usr/local/bin/licensed
-      - run: licensed status

.github/workflows/versions.yml

@@ -13,11 +13,11 @@ on:
       
 jobs:
   local-cache:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10, 12, 14]
     steps:
       - uses: actions/checkout@v2
@@ -30,11 +30,11 @@ jobs:
         shell: bash
 
   manifest:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10.15, 12.16.0, 14.2.0]
     steps:
       - uses: actions/checkout@v2
@@ -47,11 +47,11 @@ jobs:
         shell: bash
 
   check-latest:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10, 11, 12, 14]
     steps:
       - uses: actions/checkout@v2
@@ -65,11 +65,11 @@ jobs:
         shell: bash
 
   node-dist:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [11, 13]
     steps:
       - uses: actions/checkout@v2
@@ -82,11 +82,11 @@ jobs:
         shell: bash
 
   old-versions:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.operating-system }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
       # test old versions which didn't have npm and layout different
@@ -97,16 +97,3 @@ jobs:
       - name: Verify node
         run: __tests__/verify-node.sh 0.12.18 SKIP_NPM
         shell: bash
-
-  arch:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node 12 x86 from dist
-        uses: ./
-        with:
-          node-version: '12'
-          architecture: 'x86'
-      - name: Verify node
-        run: __tests__/verify-arch.sh "ia32"
-        shell: bash

.licensed.yml

@@ -1,14 +0,0 @@
-sources:
-  npm: true
-
-allowed:
-  - apache-2.0
-  - bsd-2-clause
-  - bsd-3-clause
-  - isc
-  - mit
-  - cc0-1.0
-  - unlicense
-
-reviewed:
-  npm:

CODEOWNERS

@@ -1 +0,0 @@
-* @actions/spark

README.md

@@ -10,21 +10,21 @@ This action sets by node environment for use in actions by:
 - registering problem matchers for error output
 - configuring authentication for GPR or npm
 
-# v2
+# v2-beta
 
-This release adds reliability for pulling node distributions from a cache of node releases.
+A beta release which adds reliability for pulling node distributions from a cache of node releases is available by referencing the `v2-beta` tag.
 
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v2-beta
   with:
-    node-version: '14'
+    node-version: '12'
 ```
 
-The action will first check the local cache for a semver match. The hosted images have been updated with the latest of each LTS from v8, v10, v12, and v14. `self-hosted` machines will benefit from the cache as well only downloading once. The action will pull LTS versions from [node-versions releases](https://github.com/actions/node-versions/releases) and on miss or failure will fall back to the previous behavior of downloading directly from [node dist](https://nodejs.org/dist/).
+It will first check the local cache for a semver match.  The hosted images have been updated with the latest of each LTS from v8, v10, v12, and v14. `self-hosted` machines will benefit from the cache as well only downloading once.  It will pull LTS versions from `main` branch of [node-versions](https://github.com/actions/node-versions/blob/main/versions-manifest.json) repository and on miss or failure, it will fall back to the previous behavior of download directly from [node dist](https://nodejs.org/dist/).
 
-The `node-version` input is optional. If not supplied, the node version that is PATH will be used. However, this action will still register problem matchers and support auth features. So setting up the node environment is still a valid scenario without downloading and caching versions.
+The `node-version` input is optional.  If not supplied, node which is in your PATH will be used.  However, this action will still register problem matchers and support auth features.  So setting up the node environment is still a valid scenario without downloading and caching versions.
 
 # Usage
 
@@ -34,27 +34,22 @@ Basic:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
-    node-version: '14'
+    node-version: '12'
 - run: npm install
 - run: npm test
 ```
 
 Check latest version:  
-
-In the basic example above, the `check-latest` flag defaults to `false`. When set to `false`, the action tries to first resolve a version of node from the local cache. For information regarding locally cached versions of Node on GitHub hosted runners, check out [GitHub Actions Virtual Environments](https://github.com/actions/virtual-environments). The local version of Node in cache gets updated every couple of weeks. If unable to find a specific version in the cache, the action will then attempt to download a version of Node. Use the default or set `check-latest` to `false` if you prefer stability and if you want to ensure a specific version of Node is always used.
-
-If `check-latest` is set to `true`, the action first checks if the cached version is the latest one. If the locally cached version is not the most up-to-date, a version of Node will then be downloaded. Set `check-latest` to `true` it you want the most up-to-date version of Node to always be used.
-
-> Setting `check-latest` to `true` has performance implications as downloading versions of Node is slower than using cached versions
-
+> In basic example, without `check-latest` flag, the action tries to resolve version from local cache firstly and download only if it is not found. Local cache on image is updated with a couple of weeks latency.  
+`check-latest` flag forces the action to check if the cached version is the latest one. It reduces latency significantly but it is much more likely to incur version downloading.
 ```yaml
 steps:
 - uses: actions/checkout@v2
 - uses: actions/setup-node@v2
   with:
-    node-version: '14'
+    node-version: '12'
     check-latest: true
 - run: npm install
 - run: npm test
@@ -67,78 +62,23 @@ jobs:
     runs-on: ubuntu-16.04
     strategy:
       matrix:
-        node: [ '12', '14' ]
+        node: [ '10', '12' ]
     name: Node ${{ matrix.node }} sample
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
       - run: npm install
       - run: npm test
 ```
 
-Architecture:
-
-You can use any of the [supported operating systems](https://docs.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners), and the compatible `architecture` can be selected using `architecture`. Values are `x86`, `x64`, `arm64`, `armv6l`, `armv7l`, `ppc64le`, `s390x` (not all of the architectures are available on all platforms).
-
-When using `architecture`, `node-version` must be provided as well.
-```yaml
-jobs:
-  build:
-    runs-on: windows-latest
-    name: Node sample
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          architecture: 'x64' # optional, x64 or x86. If not specified, x64 will be used by default
-      - run: npm install
-      - run: npm test
-```
-
-Multiple Operating Systems and Architectures:
-
-```yaml
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        node_version:
-          - 10
-          - 12
-          - 14
-        architecture:
-          - x64
-        # an extra windows-x86 run:
-        include:
-          - os: windows-2016
-            node_version: 12
-            architecture: x86
-    name: Node ${{ matrix.node_version }} - ${{ matrix.architecture }} on ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node_version }}
-          architecture: ${{ matrix.architecture }}
-      - run: npm install
-      - run: npm test
-```
-
 Publish to npmjs and GPR with npm:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
     node-version: '10.x'
     registry-url: 'https://registry.npmjs.org'
@@ -146,7 +86,7 @@ steps:
 - run: npm publish
   env:
     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
     registry-url: 'https://npm.pkg.github.com'
 - run: npm publish
@@ -158,7 +98,7 @@ Publish to npmjs and GPR with yarn:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
     node-version: '10.x'
     registry-url: <registry url>
@@ -166,7 +106,7 @@ steps:
 - run: yarn publish
   env:
     NODE_AUTH_TOKEN: ${{ secrets.YARN_TOKEN }}
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
     registry-url: 'https://npm.pkg.github.com'
 - run: yarn publish
@@ -178,7 +118,7 @@ Use private packages:
 ```yaml
 steps:
 - uses: actions/checkout@v2
-- uses: actions/setup-node@v2
+- uses: actions/setup-node@v1
   with:
     node-version: '10.x'
     registry-url: 'https://registry.npmjs.org'

__tests__/authutil.test.ts

@@ -20,8 +20,6 @@ describe('authutil tests', () => {
         .toString(36)
         .substring(7)
     );
-    console.log('::stop-commands::stoptoken'); // Disable executing of runner commands when running tests in actions
-    process.env['GITHUB_ENV'] = ''; // Stub out Environment file functionality so we can verify it writes to standard out (toolkit is backwards compatible)
     const tempDir = path.join(_runnerDir, randPath, 'temp');
     await io.rmRF(tempDir);
     await io.mkdirP(tempDir);
@@ -63,7 +61,6 @@ describe('authutil tests', () => {
     if (_runnerDir) {
       await io.rmRF(_runnerDir);
     }
-    console.log('::stoptoken::'); // Re-enable executing of runner commands when running tests in actions
   }, 100000);
 
   function readRcFile(rcFile: string) {
@@ -123,13 +120,4 @@ describe('authutil tests', () => {
     expect(rc['registry']).toBe('https://registry.npmjs.org/');
     expect(rc['always-auth']).toBe('true');
   });
-  it('It is already set the NODE_AUTH_TOKEN export it ', async () => {
-    process.env.NODE_AUTH_TOKEN = 'foobar';
-    await auth.configAuthentication('npm.pkg.github.com', 'false');
-    expect(fs.statSync(rcFile)).toBeDefined();
-    let rc = readRcFile(rcFile);
-    expect(rc['@ownername:registry']).toBe('npm.pkg.github.com/');
-    expect(rc['always-auth']).toBe('false');
-    expect(process.env.NODE_AUTH_TOKEN).toEqual('foobar');
-  });
 });

__tests__/installer.test.ts

@@ -8,10 +8,15 @@ import path from 'path';
 import * as main from '../src/main';
 import * as im from '../src/installer';
 import * as auth from '../src/authutil';
+import {context} from '@actions/github';
 
 let nodeTestManifest = require('./data/versions-manifest.json');
 let nodeTestDist = require('./data/node-dist-index.json');
 
+// let matchers = require('../matchers.json');
+// let matcherPattern = matchers.problemMatcher[0].pattern[0];
+// let matcherRegExp = new RegExp(matcherPattern.regexp);
+
 describe('setup-node', () => {
   let inputs = {} as any;
   let os = {} as any;
@@ -37,8 +42,6 @@ describe('setup-node', () => {
 
   beforeEach(() => {
     // @actions/core
-    console.log('::stop-commands::stoptoken'); // Disable executing of runner commands when running tests in actions
-    process.env['GITHUB_PATH'] = ''; // Stub out ENV file functionality so we can verify it writes to standard out
     inputs = {};
     inSpy = jest.spyOn(core, 'getInput');
     inSpy.mockImplementation(name => inputs[name]);
@@ -99,9 +102,7 @@ describe('setup-node', () => {
     //jest.restoreAllMocks();
   });
 
-  afterAll(async () => {
-    console.log('::stoptoken::'); // Re-enable executing of runner commands when running tests in actions
-  }, 100000);
+  afterAll(async () => {}, 100000);
 
   //--------------------------------------------------
   // Manifest find tests
@@ -247,7 +248,7 @@ describe('setup-node', () => {
     expect(dlSpy).toHaveBeenCalled();
     expect(exSpy).toHaveBeenCalled();
     expect(logSpy).toHaveBeenCalledWith(
-      `Acquiring ${resolvedVersion} - ${os.arch} from ${expectedUrl}`
+      `Acquiring ${resolvedVersion} from ${expectedUrl}`
     );
     expect(logSpy).toHaveBeenCalledWith(
       `Attempting to download ${versionSpec}...`
@@ -336,46 +337,6 @@ describe('setup-node', () => {
     expect(cnSpy).toHaveBeenCalledWith(`::error::${errMsg}${osm.EOL}`);
   });
 
-  it('Acquires specified architecture of node', async () => {
-    for (const {arch, version, osSpec} of [
-      {arch: 'x86', version: '12.16.2', osSpec: 'win32'},
-      {arch: 'x86', version: '14.0.0', osSpec: 'win32'}
-    ]) {
-      os.platform = osSpec;
-      os.arch = arch;
-      const fileExtension = os.platform === 'win32' ? '7z' : 'tar.gz';
-      const platform = {
-        linux: 'linux',
-        darwin: 'darwin',
-        win32: 'win'
-      }[os.platform];
-
-      inputs['node-version'] = version;
-      inputs['architecture'] = arch;
-      inputs['always-auth'] = false;
-      inputs['token'] = 'faketoken';
-
-      let expectedUrl =
-        arch === 'x64'
-          ? `https://github.com/actions/node-versions/releases/download/${version}/node-${version}-${platform}-${arch}.zip`
-          : `https://nodejs.org/dist/v${version}/node-v${version}-${platform}-${arch}.${fileExtension}`;
-
-      // ... but not in the local cache
-      findSpy.mockImplementation(() => '');
-
-      dlSpy.mockImplementation(async () => '/some/temp/path');
-      let toolPath = path.normalize(`/cache/node/${version}/${arch}`);
-      exSpy.mockImplementation(async () => '/some/other/temp/path');
-      cacheSpy.mockImplementation(async () => toolPath);
-
-      await main.run();
-      expect(dlSpy).toHaveBeenCalled();
-      expect(logSpy).toHaveBeenCalledWith(
-        `Acquiring ${version} - ${arch} from ${expectedUrl}`
-      );
-    }
-  }, 100000);
-
   describe('check-latest flag', () => {
     it('use local version and dont check manifest if check-latest is not specified', async () => {
       os.platform = 'linux';
@@ -438,7 +399,7 @@ describe('setup-node', () => {
       );
       expect(logSpy).toHaveBeenCalledWith("Resolved as '12.16.2'");
       expect(logSpy).toHaveBeenCalledWith(
-        `Acquiring 12.16.2 - ${os.arch} from ${expectedUrl}`
+        `Acquiring 12.16.2 from ${expectedUrl}`
       );
       expect(logSpy).toHaveBeenCalledWith('Extracting ...');
     });

__tests__/problem-matcher.test.ts

@@ -1,43 +0,0 @@
-describe('problem matcher tests', () => {
-  it('tsc: matches TypeScript "pretty" error message', () => {
-    const [
-      {
-        pattern: [{regexp}]
-      }
-    ] = require('../.github/tsc.json').problemMatcher;
-    const exampleErrorMessage =
-      "lib/index.js:23:42 - error TS2345: Argument of type 'A' is not assignable to parameter of type 'B'.";
-
-    const match = exampleErrorMessage.match(new RegExp(regexp));
-    expect(match).not.toBeNull();
-    expect(match![1]).toEqual('lib/index.js');
-    expect(match![2]).toEqual('23');
-    expect(match![3]).toEqual('42');
-    expect(match![4]).toEqual('error');
-    expect(match![5]).toEqual('2345');
-    expect(match![6]).toEqual(
-      "Argument of type 'A' is not assignable to parameter of type 'B'."
-    );
-  });
-
-  it('tsc: matches TypeScript error message from log file', () => {
-    const [
-      {
-        pattern: [{regexp}]
-      }
-    ] = require('../.github/tsc.json').problemMatcher;
-    const exampleErrorMessage =
-      "lib/index.js(23,42): error TS2345: Argument of type 'A' is not assignable to parameter of type 'B'.";
-
-    const match = exampleErrorMessage.match(new RegExp(regexp));
-    expect(match).not.toBeNull();
-    expect(match![1]).toEqual('lib/index.js');
-    expect(match![2]).toEqual('23');
-    expect(match![3]).toEqual('42');
-    expect(match![4]).toEqual('error');
-    expect(match![5]).toEqual('2345');
-    expect(match![6]).toEqual(
-      "Argument of type 'A' is not assignable to parameter of type 'B'."
-    );
-  });
-});

__tests__/verify-arch.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ -n "$1" ]; then
-  architecture="$(node -e 'console.log(process.arch)')"
-  if [ -z "$(echo $architecture | grep --fixed-strings $1)" ]; then
-    echo "Unexpected architecture"
-    exit 1
-  fi
-else
-  echo "Skip testing architecture"
-fi

action.yml

@@ -7,8 +7,6 @@ inputs:
     default: 'false'
   node-version:
     description: 'Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0'
-  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

docs/adrs/0000-caching-dependencies.md

@@ -1,59 +0,0 @@
-# 0. Caching dependencies
-Date: 2021-05-21
-
-Status: Proposed
-
-# Context
-`actions/setup-node` is the 2nd most popular action in GitHub Actions. A lot of customers use it in conjunction with [actions/cache](https://github.com/actions/cache) to speed up dependencies installation.  
-See more examples on proper usage in [actions/cache documentation](https://github.com/actions/cache/blob/main/examples.md#node---npm).
-
-# Goals & Anti-Goals
-Integration of caching functionality into `actions/setup-node` action will bring the following benefits for action users:
-- Decrease the entry threshold for using the cache for Node.js dependencies and simplify initial configuration
-- Simplify YAML pipelines because no need additional steps to enable caching
-- More users will use cache for Node.js so more customers will have fast builds!
-
-We will add support for NPM and Yarn dependencies caching.  
-As the first stage, we won't support custom locations for `package-lock.json`, `yarn.lock` files and action will work only when files are located in repository root. 
-
-We don't pursue the goal to provide wide customization of caching in scope of `actions/setup-node` action. The purpose of this integration is covering ~90% of basic use-cases. If user needs flexible customization, we should advice them to use `actions/cache` directly.
-
-# Decision
-- Add `cache` input parameter to `actions/setup-node`. For now, input will accept the following values: 
-  - `npm` - enable caching for npm dependencies
-  - `yarn` - enable caching for yarn dependencies
-  - `''` - disable caching (default value)
-- Cache feature will be disabled by default to make sure that we don't break existing customers. We will consider enabling cache by default in next major release (`v3`)
-- Action will try to search `package-lock.json` or `yarn.lock` (npm 7.x supports `yarn.lock` files) files in the repository root and throw error if no one is found
-- The hash of found file will be used as cache key (the same approach like [actions/cache](https://github.com/actions/cache/blob/main/examples.md#node---npm) recommends)
-- The following key cache will be used `${{ runner.os }}-npm-${{ hashFiles('<package-lock-path>') }}`
-- Action will cache global cache:
-  - Npm (retrieved via `npm config get cache`)
-  - Yarn 1 (retrieved via `yarn cache dir`)
-  - Yarn 2 (retrieved via `yarn config get cacheFolder`)
-
-# Example of real use-cases
-Npm package manager:
-```yml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-node@v2
-  with:
-    node-version: '14'
-    cache: npm
-```
-
-Yarn package manager:
-```yml
-steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-node@v2
-  with:
-    node-version: '14'
-    cache: yarn
-```
-
-# Release process
-
-As soon as functionality is implemented, we will release minor update of action. No need to bump major version since there are no breaking changes for existing users.
-After that, we will update [starter-workflows](https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml) and [GitHub Action documentation](https://docs.github.com/en/actions/guides/building-and-testing-nodejs#example-caching-dependencies).

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@actions/core": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
-      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.2.tgz",
+      "integrity": "sha512-IbCx7oefq+Gi6FWbSs2Fnw8VkEI6Y4gvjrYprY3RV//ksq/KPMlClOerJ4jRosyal6zkUIc8R9fS/cpRMlGClg=="
     },
     "@actions/exec": {
       "version": "1.0.4",
@@ -1423,10 +1423,10 @@
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
-    "@zeit/ncc": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.21.0.tgz",
-      "integrity": "sha512-RUMdvVK/w78oo+yBjruZltt0kJXYar2un/1bYQ2LuHG7GmFVm+QjxzEmySwREctaJdEnBvlMdUNWd9hXHxEI3g==",
+    "@vercel/ncc": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.23.0.tgz",
+      "integrity": "sha512-Fcr1qlG9t54X4X9qbo/+jr1+t5Qc6H3TgIRBXmKkF/WDs6YFulAN6ilq2Ehx38RbgIOFxaZnjlAQ50GyexnMpQ==",
       "dev": true
     },
     "abab": {
@@ -6336,9 +6336,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
     "lodash.get": {

package.json

@@ -23,7 +23,7 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.2.2",
     "@actions/exec": "^1.0.3",
     "@actions/github": "^1.1.0",
     "@actions/http-client": "^1.0.6",
@@ -35,7 +35,7 @@
     "@types/jest": "^24.0.13",
     "@types/node": "^12.0.4",
     "@types/semver": "^6.0.0",
-    "@zeit/ncc": "^0.21.0",
+    "@vercel/ncc": "^0.23.0",
     "jest": "^24.9.0",
     "jest-circus": "^24.7.1",
     "prettier": "^1.19.1",

src/authutil.ts

@@ -53,9 +53,6 @@ function writeRegistryToFile(
   newContents += `${authString}${os.EOL}${registryString}${os.EOL}${alwaysAuthString}`;
   fs.writeFileSync(fileLocation, newContents);
   core.exportVariable('NPM_CONFIG_USERCONFIG', fileLocation);
-  // Export empty node_auth_token if didn't exist so npm doesn't complain about not being able to find it
-  core.exportVariable(
-    'NODE_AUTH_TOKEN',
-    process.env.NODE_AUTH_TOKEN || 'XXXXX-XXXXX-XXXXX-XXXXX'
-  );
+  // Export empty node_auth_token so npm doesn't complain about not being able to find it
+  core.exportVariable('NODE_AUTH_TOKEN', 'XXXXX-XXXXX-XXXXX-XXXXX');
 }

src/installer.ts

@@ -20,7 +20,6 @@ export interface INodeVersion {
 interface INodeVersionInfo {
   downloadUrl: string;
   resolvedVersion: string;
-  arch: string;
   fileName: string;
 }
 
@@ -28,19 +27,17 @@ export async function getNode(
   versionSpec: string,
   stable: boolean,
   checkLatest: boolean,
-  auth: string | undefined,
-  arch: string = os.arch()
+  auth: string | undefined
 ) {
   let osPlat: string = os.platform();
-  let osArch: string = translateArchToDistUrl(arch);
+  let osArch: string = translateArchToDistUrl(os.arch());
 
   if (checkLatest) {
     core.info('Attempt to resolve the latest version from manifest...');
     const resolvedVersion = await resolveVersionFromManifest(
       versionSpec,
       stable,
-      auth,
-      osArch
+      auth
     );
     if (resolvedVersion) {
       versionSpec = resolvedVersion;
@@ -52,7 +49,7 @@ export async function getNode(
 
   // check cache
   let toolPath: string;
-  toolPath = tc.find('node', versionSpec, osArch);
+  toolPath = tc.find('node', versionSpec);
 
   // If not found in cache, download
   if (toolPath) {
@@ -66,11 +63,9 @@ export async function getNode(
     // Try download from internal distribution (popular versions only)
     //
     try {
-      info = await getInfoFromManifest(versionSpec, stable, auth, osArch);
+      info = await getInfoFromManifest(versionSpec, stable, auth);
       if (info) {
-        core.info(
-          `Acquiring ${info.resolvedVersion} - ${info.arch} from ${info.downloadUrl}`
-        );
+        core.info(`Acquiring ${info.resolvedVersion} from ${info.downloadUrl}`);
         downloadPath = await tc.downloadTool(info.downloadUrl, undefined, auth);
       } else {
         core.info(
@@ -97,24 +92,19 @@ export async function getNode(
     // Download from nodejs.org
     //
     if (!downloadPath) {
-      info = await getInfoFromDist(versionSpec, arch);
+      info = await getInfoFromDist(versionSpec);
       if (!info) {
         throw new Error(
           `Unable to find Node version '${versionSpec}' for platform ${osPlat} and architecture ${osArch}.`
         );
       }
 
-      core.info(
-        `Acquiring ${info.resolvedVersion} - ${info.arch} from ${info.downloadUrl}`
-      );
+      core.info(`Acquiring ${info.resolvedVersion} from ${info.downloadUrl}`);
       try {
         downloadPath = await tc.downloadTool(info.downloadUrl);
       } catch (err) {
         if (err instanceof tc.HTTPError && err.httpStatusCode == 404) {
-          return await acquireNodeFromFallbackLocation(
-            info.resolvedVersion,
-            info.arch
-          );
+          return await acquireNodeFromFallbackLocation(info.resolvedVersion);
         }
 
         throw err;
@@ -147,12 +137,7 @@ export async function getNode(
     // Install into the local tool cache - node extracts with a root folder that matches the fileName downloaded
     //
     core.info('Adding to the cache ...');
-    toolPath = await tc.cacheDir(
-      extPath,
-      'node',
-      info.resolvedVersion,
-      info.arch
-    );
+    toolPath = await tc.cacheDir(extPath, 'node', info.resolvedVersion);
     core.info('Done');
   }
 
@@ -173,8 +158,7 @@ export async function getNode(
 async function getInfoFromManifest(
   versionSpec: string,
   stable: boolean,
-  auth: string | undefined,
-  osArch: string = translateArchToDistUrl(os.arch())
+  auth: string | undefined
 ): Promise<INodeVersionInfo | null> {
   let info: INodeVersionInfo | null = null;
   const releases = await tc.getManifestFromRepo(
@@ -183,12 +167,11 @@ async function getInfoFromManifest(
     auth,
     'main'
   );
-  const rel = await tc.findFromManifest(versionSpec, stable, releases, osArch);
+  const rel = await tc.findFromManifest(versionSpec, stable, releases);
 
   if (rel && rel.files.length > 0) {
     info = <INodeVersionInfo>{};
     info.resolvedVersion = rel.version;
-    info.arch = rel.files[0].arch;
     info.downloadUrl = rel.files[0].download_url;
     info.fileName = rel.files[0].filename;
   }
@@ -197,15 +180,14 @@ async function getInfoFromManifest(
 }
 
 async function getInfoFromDist(
-  versionSpec: string,
-  arch: string = os.arch()
+  versionSpec: string
 ): Promise<INodeVersionInfo | null> {
   let osPlat: string = os.platform();
-  let osArch: string = translateArchToDistUrl(arch);
+  let osArch: string = translateArchToDistUrl(os.arch());
 
   let version: string;
 
-  version = await queryDistForMatch(versionSpec, arch);
+  version = await queryDistForMatch(versionSpec);
   if (!version) {
     return null;
   }
@@ -225,7 +207,6 @@ async function getInfoFromDist(
   return <INodeVersionInfo>{
     downloadUrl: url,
     resolvedVersion: version,
-    arch: arch,
     fileName: fileName
   };
 }
@@ -233,11 +214,10 @@ async function getInfoFromDist(
 async function resolveVersionFromManifest(
   versionSpec: string,
   stable: boolean,
-  auth: string | undefined,
-  osArch: string = translateArchToDistUrl(os.arch())
+  auth: string | undefined
 ): Promise<string | undefined> {
   try {
-    const info = await getInfoFromManifest(versionSpec, stable, auth, osArch);
+    const info = await getInfoFromManifest(versionSpec, stable, auth);
     return info?.resolvedVersion;
   } catch (err) {
     core.info('Unable to resolve version from manifest...');
@@ -273,12 +253,9 @@ function evaluateVersions(versions: string[], versionSpec: string): string {
   return version;
 }
 
-async function queryDistForMatch(
-  versionSpec: string,
-  arch: string = os.arch()
-): Promise<string> {
+async function queryDistForMatch(versionSpec: string): Promise<string> {
   let osPlat: string = os.platform();
-  let osArch: string = translateArchToDistUrl(arch);
+  let osArch: string = translateArchToDistUrl(os.arch());
 
   // node offers a json list of versions
   let dataFileName: string;
@@ -334,11 +311,10 @@ export async function getVersionsFromDist(): Promise<INodeVersion[]> {
 // Note also that the files are normally zipped but in this case they are just an exe
 // and lib file in a folder, not zipped.
 async function acquireNodeFromFallbackLocation(
-  version: string,
-  arch: string = os.arch()
+  version: string
 ): Promise<string> {
   let osPlat: string = os.platform();
-  let osArch: string = translateArchToDistUrl(arch);
+  let osArch: string = translateArchToDistUrl(os.arch());
 
   // Create temporary folder to download in to
   const tempDownloadFolder: string =
@@ -372,7 +348,7 @@ async function acquireNodeFromFallbackLocation(
       throw err;
     }
   }
-  let toolPath = await tc.cacheDir(tempDir, 'node', version, arch);
+  let toolPath = await tc.cacheDir(tempDir, 'node', version);
   core.addPath(toolPath);
   return toolPath;
 }

src/main.ts

@@ -3,7 +3,6 @@ import * as installer from './installer';
 import * as auth from './authutil';
 import * as path from 'path';
 import {URL} from 'url';
-import os = require('os');
 
 export async function run() {
   try {
@@ -16,27 +15,13 @@ export async function run() {
       version = core.getInput('version');
     }
 
-    let arch = core.getInput('architecture');
-
-    // if architecture supplied but node-version is not
-    // if we don't throw a warning, the already installed x64 node will be used which is not probably what user meant.
-    if (arch && !version) {
-      core.warning(
-        '`architecture` is provided but `node-version` is missing. In this configuration, the version/architecture of Node will not be changed. To fix this, provide `architecture` in combination with `node-version`'
-      );
-    }
-
-    if (!arch) {
-      arch = os.arch();
-    }
-
     if (version) {
       let token = core.getInput('token');
       let auth = !token || isGhes() ? undefined : `token ${token}`;
       let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
       const checkLatest =
         (core.getInput('check-latest') || 'false').toUpperCase() === 'TRUE';
-      await installer.getNode(version, stable, checkLatest, auth, arch);
+      await installer.getNode(version, stable, checkLatest, auth);
     }
 
     const registryUrl: string = core.getInput('registry-url');
@@ -46,11 +31,11 @@ export async function run() {
     }
 
     const matchersPath = path.join(__dirname, '..', '.github');
-    core.info(`##[add-matcher]${path.join(matchersPath, 'tsc.json')}`);
-    core.info(
+    console.log(`##[add-matcher]${path.join(matchersPath, 'tsc.json')}`);
+    console.log(
       `##[add-matcher]${path.join(matchersPath, 'eslint-stylish.json')}`
     );
-    core.info(
+    console.log(
       `##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}`
     );
   } catch (error) {