Fix typo

.github/workflows/e2e-cache.yml

@@ -98,8 +98,8 @@ jobs:
         run: __tests__/verify-node.sh "${{ matrix.node-version }}"
         shell: bash
 
-  node-yarn3-depencies-caching:
-    name: Test yarn 3 (Node ${{ matrix.node-version}}, ${{ matrix.os }})
+  node-yarn2-depencies-caching:
+    name: Test yarn 2 (Node ${{ matrix.node-version}}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     env:
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
@@ -111,7 +111,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Update yarn
-        run: yarn set version 3.6.4
+        run: yarn set version berry
       - name: Yarn version
         run: yarn --version
       - name: Generate simple .yarnrc.yml

__tests__/cache-save.test.ts

@@ -92,9 +92,6 @@ describe('run', () => {
 
     it('Package manager is not valid, skip caching', async () => {
       inputs['cache'] = 'yarn3';
-      getStateSpy.mockImplementation(key =>
-        key === State.CachePackageManager ? inputs['cache'] : ''
-      );
 
       await run();
 
@@ -111,9 +108,7 @@ describe('run', () => {
     it('should not save cache for yarn1', async () => {
       inputs['cache'] = 'yarn';
       getStateSpy.mockImplementation(key =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CachePrimaryKey || key === State.CacheMatchedKey
+        key === State.CachePrimaryKey || key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePaths
           ? '["/foo/bar"]'
@@ -122,8 +117,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).toHaveBeenCalledWith(
@@ -135,9 +130,7 @@ describe('run', () => {
     it('should not save cache for yarn2', async () => {
       inputs['cache'] = 'yarn';
       getStateSpy.mockImplementation(key =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CachePrimaryKey || key === State.CacheMatchedKey
+        key === State.CachePrimaryKey || key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePaths
           ? '["/foo/bar"]'
@@ -146,8 +139,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).toHaveBeenCalledWith(
@@ -159,9 +152,7 @@ describe('run', () => {
     it('should not save cache for npm', async () => {
       inputs['cache'] = 'npm';
       getStateSpy.mockImplementation(key =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CachePrimaryKey || key === State.CacheMatchedKey
+        key === State.CachePrimaryKey || key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePaths
           ? '["/foo/bar"]'
@@ -171,8 +162,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(setFailedSpy).not.toHaveBeenCalled();
@@ -181,9 +172,7 @@ describe('run', () => {
     it('should not save cache for pnpm', async () => {
       inputs['cache'] = 'pnpm';
       getStateSpy.mockImplementation(key =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CachePrimaryKey || key === State.CacheMatchedKey
+        key === State.CachePrimaryKey || key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePaths
           ? '["/foo/bar"]'
@@ -192,8 +181,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(setFailedSpy).not.toHaveBeenCalled();
@@ -204,9 +193,7 @@ describe('run', () => {
     it('saves cache from yarn 1', async () => {
       inputs['cache'] = 'yarn';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePrimaryKey
           ? npmFileHash
@@ -217,8 +204,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(
@@ -234,9 +221,7 @@ describe('run', () => {
     it('saves cache from yarn 2', async () => {
       inputs['cache'] = 'yarn';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? yarnFileHash
           : key === State.CachePrimaryKey
           ? npmFileHash
@@ -247,8 +232,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(
@@ -264,9 +249,7 @@ describe('run', () => {
     it('saves cache from npm', async () => {
       inputs['cache'] = 'npm';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? npmFileHash
           : key === State.CachePrimaryKey
           ? yarnFileHash
@@ -277,8 +260,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(
@@ -294,9 +277,7 @@ describe('run', () => {
     it('saves cache from pnpm', async () => {
       inputs['cache'] = 'pnpm';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? pnpmFileHash
           : key === State.CachePrimaryKey
           ? npmFileHash
@@ -307,8 +288,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(
@@ -324,9 +305,7 @@ describe('run', () => {
     it('save with -1 cacheId , should not fail workflow', async () => {
       inputs['cache'] = 'npm';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? npmFileHash
           : key === State.CachePrimaryKey
           ? yarnFileHash
@@ -340,8 +319,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(
@@ -357,9 +336,7 @@ describe('run', () => {
     it('saves with error from toolkit, should fail workflow', async () => {
       inputs['cache'] = 'npm';
       getStateSpy.mockImplementation((key: string) =>
-        key === State.CachePackageManager
-          ? inputs['cache']
-          : key === State.CacheMatchedKey
+        key === State.CacheMatchedKey
           ? npmFileHash
           : key === State.CachePrimaryKey
           ? yarnFileHash
@@ -373,8 +350,8 @@ describe('run', () => {
 
       await run();
 
-      expect(getInputSpy).not.toHaveBeenCalled();
-      expect(getStateSpy).toHaveBeenCalledTimes(4);
+      expect(getInputSpy).toHaveBeenCalled();
+      expect(getStateSpy).toHaveBeenCalledTimes(3);
       expect(getCommandOutputSpy).toHaveBeenCalledTimes(0);
       expect(debugSpy).toHaveBeenCalledTimes(0);
       expect(infoSpy).not.toHaveBeenCalledWith(

__tests__/official-installer.test.ts

@@ -357,41 +357,6 @@ describe('setup-node', () => {
     expect(cnSpy).toHaveBeenCalledWith(`::error::${errMsg}${osm.EOL}`);
   });
 
-  it('reports when download failed but version exists', async () => {
-    os.platform = 'linux';
-    os.arch = 'x64';
-
-    // a version which is not in the manifest but is in node dist
-    const versionSpec = '11.15.0';
-
-    inputs['node-version'] = versionSpec;
-    inputs['always-auth'] = false;
-    inputs['token'] = 'faketoken';
-
-    // ... but not in the local cache
-    findSpy.mockImplementation(() => '');
-
-    dlSpy.mockImplementationOnce(async () => {
-      throw new tc.HTTPError(404);
-    });
-
-    await main.run();
-
-    expect(getManifestSpy).toHaveBeenCalled();
-    expect(logSpy).toHaveBeenCalledWith(
-      `Attempting to download ${versionSpec}...`
-    );
-    expect(logSpy).toHaveBeenCalledWith(
-      'Not found in manifest. Falling back to download directly from Node'
-    );
-    expect(dlSpy).toHaveBeenCalled();
-    expect(warningSpy).toHaveBeenCalledWith(
-      `Node version ${versionSpec} for platform ${os.platform} and architecture ${os.arch} was found but failed to download. ` +
-        'This usually happens when downloadable binaries are not fully updated at https://nodejs.org/. ' +
-        'To resolve this issue you may either fall back to the older version or try again later.'
-    );
-  });
-
   it('acquires specified architecture of node', async () => {
     for (const {arch, version, osSpec} of [
       {arch: 'x86', version: '12.16.2', osSpec: 'win32'},

package.json

@@ -37,22 +37,22 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.6",
+    "@types/jest": "^27.0.2",
     "@types/node": "^16.11.25",
     "@types/semver": "^6.0.0",
     "@types/uuid": "^9.0.3",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",
-    "@vercel/ncc": "^0.38.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": "^29.7.0",
-    "jest-circus": "^29.7.0",
-    "jest-each": "^29.7.0",
+    "jest": "^27.2.5",
+    "jest-circus": "^27.2.5",
+    "jest-each": "^27.2.5",
     "prettier": "^2.8.4",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^27.0.5",
     "typescript": "^4.2.3"
   }
 }

src/cache-save.ts

@@ -1,6 +1,8 @@
 import * as core from '@actions/core';
 import * as cache from '@actions/cache';
 
+import fs from 'fs';
+
 import {State} from './constants';
 import {getPackageManagerInfo} from './cache-utils';
 
@@ -14,19 +16,20 @@ process.on('uncaughtException', e => {
 
 export async function run() {
   try {
-    const cacheLock = core.getState(State.CachePackageManager);
+    const cacheLock = core.getInput('cache');
     await cachePackages(cacheLock);
   } catch (error) {
-    core.setFailed((error as Error).message);
+    core.setFailed(error.message);
   }
 }
 
 const cachePackages = async (packageManager: string) => {
   const state = core.getState(State.CacheMatchedKey);
   const primaryKey = core.getState(State.CachePrimaryKey);
-  const cachePaths = JSON.parse(
+  let cachePaths = JSON.parse(
     core.getState(State.CachePaths) || '[]'
   ) as string[];
+  cachePaths = cachePaths.filter(fs.existsSync);
 
   const packageManagerInfo = await getPackageManagerInfo(packageManager);
   if (!packageManagerInfo) {

src/constants.ts

@@ -5,7 +5,6 @@ export enum LockType {
 }
 
 export enum State {
-  CachePackageManager = 'SETUP_NODE_CACHE_PACKAGE_MANAGER',
   CachePrimaryKey = 'CACHE_KEY',
   CacheMatchedKey = 'CACHE_RESULT',
   CachePaths = 'CACHE_PATHS'

src/distributions/official_builds/official_builds.ts

@@ -18,7 +18,6 @@ export default class OfficialBuilds extends BaseDistribution {
     let manifest: tc.IToolRelease[] | undefined;
     let nodeJsVersions: INodeVersion[] | undefined;
     const osArch = this.translateArchToDistUrl(this.nodeInfo.arch);
-
     if (this.isLtsAlias(this.nodeInfo.versionSpec)) {
       core.info('Attempt to resolve LTS alias from manifest...');
 
@@ -62,10 +61,7 @@ export default class OfficialBuilds extends BaseDistribution {
 
     if (toolPath) {
       core.info(`Found in cache @ ${toolPath}`);
-      this.addToolPath(toolPath);
-      return;
-    }
-
+    } else {
       let downloadPath = '';
       try {
         core.info(`Attempting to download ${this.nodeInfo.versionSpec}...`);
@@ -76,7 +72,6 @@ export default class OfficialBuilds extends BaseDistribution {
           osArch,
           manifest
         );
-
         if (versionInfo) {
           core.info(
             `Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`
@@ -105,58 +100,31 @@ export default class OfficialBuilds extends BaseDistribution {
             `Received HTTP status code ${err.httpStatusCode}. This usually indicates the rate limit has been exceeded`
           );
         } else {
-        core.info((err as Error).message);
+          core.info(err.message);
         }
-      core.debug((err as Error).stack ?? 'empty stack');
+        core.debug(err.stack);
         core.info('Falling back to download directly from Node');
       }
 
       if (!toolPath) {
-      toolPath = await this.downloadDirectlyFromNode();
-    }
-
-    if (this.osPlat != 'win32') {
-      toolPath = path.join(toolPath, 'bin');
-    }
-
-    core.addPath(toolPath);
-  }
-
-  protected addToolPath(toolPath: string) {
-    if (this.osPlat != 'win32') {
-      toolPath = path.join(toolPath, 'bin');
-    }
-
-    core.addPath(toolPath);
-  }
-
-  protected async downloadDirectlyFromNode() {
         const nodeJsVersions = await this.getNodeJsVersions();
         const versions = this.filterVersions(nodeJsVersions);
         const evaluatedVersion = this.evaluateVersions(versions);
-
         if (!evaluatedVersion) {
           throw new Error(
             `Unable to find Node version '${this.nodeInfo.versionSpec}' for platform ${this.osPlat} and architecture ${this.nodeInfo.arch}.`
           );
         }
-
         const toolName = this.getNodejsDistInfo(evaluatedVersion);
-
-    try {
-      const toolPath = await this.downloadNodejs(toolName);
-      return toolPath;
-    } catch (error) {
-      if (error instanceof tc.HTTPError && error.httpStatusCode === 404) {
-        core.warning(
-          `Node version ${this.nodeInfo.versionSpec} for platform ${this.osPlat} and architecture ${this.nodeInfo.arch} was found but failed to download. ` +
-            'This usually happens when downloadable binaries are not fully updated at https://nodejs.org/. ' +
-            'To resolve this issue you may either fall back to the older version or try again later.'
-        );
+        toolPath = await this.downloadNodejs(toolName);
+      }
     }
 
-      throw error;
+    if (this.osPlat != 'win32') {
+      toolPath = path.join(toolPath, 'bin');
     }
+
+    core.addPath(toolPath);
   }
 
   protected evaluateVersions(versions: string[]): string {
@@ -246,7 +214,7 @@ export default class OfficialBuilds extends BaseDistribution {
       return info?.resolvedVersion;
     } catch (err) {
       core.info('Unable to resolve version from manifest...');
-      core.debug((err as Error).message);
+      core.debug(err.message);
     }
   }
 

src/main.ts

@@ -9,7 +9,6 @@ import {restoreCache} from './cache-restore';
 import {isCacheFeatureAvailable} from './cache-utils';
 import {getNodejsDistribution} from './distributions/installer-factory';
 import {parseNodeVersionFile, printEnvDetailsAndSetOutput} from './util';
-import {State} from './constants';
 
 export async function run() {
   try {
@@ -61,7 +60,6 @@ export async function run() {
     }
 
     if (cache && isCacheFeatureAvailable()) {
-      core.saveState(State.CachePackageManager, cache);
       const cacheDependencyPath = core.getInput('cache-dependency-path');
       await restoreCache(cache, cacheDependencyPath);
     }
@@ -75,7 +73,7 @@ export async function run() {
       `##[add-matcher]${path.join(matchersPath, 'eslint-compact.json')}`
     );
   } catch (err) {
-    core.setFailed((err as Error).message);
+    core.setFailed(err.message);
   }
 }