Update build

.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-utils.test.ts

@@ -6,8 +6,7 @@ import {
   PackageManagerInfo,
   isCacheFeatureAvailable,
   supportedPackageManagers,
-  getCommandOutput,
-  resetProjectDirectoriesMemoized
+  getProjectDirectoriesFromCacheDependencyPath
 } from '../src/cache-utils';
 import fs from 'fs';
 import * as cacheUtils from '../src/cache-utils';
@@ -123,7 +122,7 @@ describe('cache-utils', () => {
           MockGlobber.create(['/foo', '/bar'])
       );
 
-      resetProjectDirectoriesMemoized();
+      getProjectDirectoriesFromCacheDependencyPath.cache.clear?.();
     });
 
     afterEach(() => {

__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

@@ -33,26 +33,26 @@
     "@actions/http-client": "^1.0.11",
     "@actions/io": "^1.0.2",
     "@actions/tool-cache": "^1.5.4",
-    "semver": "^6.3.1",
-    "uuid": "^9.0.0"
+    "lodash.memoize": "^4.1.2",
+    "semver": "^6.3.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.6",
+    "@types/jest": "^27.0.2",
+    "@types/lodash.memoize": "^4.1.7",
     "@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

@@ -17,7 +17,7 @@ export async function run() {
     const cacheLock = core.getState(State.CachePackageManager);
     await cachePackages(cacheLock);
   } catch (error) {
-    core.setFailed((error as Error).message);
+    core.setFailed(error.message);
   }
 }
 

src/cache-utils.ts

@@ -2,6 +2,7 @@ import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as cache from '@actions/cache';
 import * as glob from '@actions/glob';
+import memoize from 'lodash.memoize';
 import path from 'path';
 import fs from 'fs';
 import {unique} from './util';
@@ -111,50 +112,38 @@ export const getPackageManagerInfo = async (packageManager: string) => {
 };
 
 /**
+ * Expands (converts) the string input `cache-dependency-path` to list of directories that
+ * may be project roots
+ *
  * getProjectDirectoriesFromCacheDependencyPath is called twice during `restoreCache`
  *  - first through `getCacheDirectories`
  *  - second from `repoHasYarn3ManagedCache`
  *
- *  it contains expensive IO operation and thus should be memoized
- */
-
-let projectDirectoriesMemoized: string[] | null = null;
-/**
- * unit test must reset memoized variables
- */
-export const resetProjectDirectoriesMemoized = () =>
-  (projectDirectoriesMemoized = null);
-/**
- * Expands (converts) the string input `cache-dependency-path` to list of directories that
- * may be project roots
+ * it contains expensive IO operation and thus should be memoized
+ *
  * @param cacheDependencyPath - either a single string or multiline string with possible glob patterns
  *                              expected to be the result of `core.getInput('cache-dependency-path')`
- * @return list of directories and possible
+ * @return list of directories
  */
-const getProjectDirectoriesFromCacheDependencyPath = async (
-  cacheDependencyPath: string
-): Promise<string[]> => {
-  if (projectDirectoriesMemoized !== null) {
-    return projectDirectoriesMemoized;
+export const getProjectDirectoriesFromCacheDependencyPath = memoize(
+  async (cacheDependencyPath: string): Promise<string[]> => {
+    const globber = await glob.create(cacheDependencyPath);
+    const cacheDependenciesPaths = await globber.glob();
+
+    const existingDirectories: string[] = cacheDependenciesPaths
+      .map(path.dirname)
+      .filter(unique())
+      .map(dirName => fs.realpathSync(dirName))
+      .filter(directory => fs.lstatSync(directory).isDirectory());
+
+    if (!existingDirectories.length)
+      core.warning(
+        `No existing directories found containing cache-dependency-path="${cacheDependencyPath}"`
+      );
+
+    return existingDirectories;
   }
-
-  const globber = await glob.create(cacheDependencyPath);
-  const cacheDependenciesPaths = await globber.glob();
-
-  const existingDirectories: string[] = cacheDependenciesPaths
-    .map(path.dirname)
-    .filter(unique())
-    .map(dirName => fs.realpathSync(dirName))
-    .filter(directory => fs.lstatSync(directory).isDirectory());
-
-  if (!existingDirectories.length)
-    core.warning(
-      `No existing directories found containing cache-dependency-path="${cacheDependencyPath}"`
-    );
-
-  projectDirectoriesMemoized = existingDirectories;
-  return existingDirectories;
-};
+);
 
 /**
  * Finds the cache directories configured for the repo if cache-dependency-path is not empty

src/distributions/base-distribution.ts

@@ -1,4 +1,3 @@
-import {v4 as uuidv4} from 'uuid';
 import * as tc from '@actions/tool-cache';
 import * as hc from '@actions/http-client';
 import * as core from '@actions/core';
@@ -167,8 +166,9 @@ export default abstract class BaseDistribution {
     const initialUrl = this.getDistributionUrl();
     const osArch: string = this.translateArchToDistUrl(arch);
 
-    // Create temporary folder to download to
-    const tempDownloadFolder = `temp_${uuidv4()}`;
+    // Create temporary folder to download in to
+    const tempDownloadFolder: string =
+      'temp_' + Math.floor(Math.random() * 2000000000);
     const tempDirectory = process.env['RUNNER_TEMP'] || '';
     assert.ok(tempDirectory, 'Expected RUNNER_TEMP to be defined');
     const tempDir: string = path.join(tempDirectory, tempDownloadFolder);

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,57 +61,63 @@ 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}...`);
 
-    let downloadPath = '';
-    try {
-      core.info(`Attempting to download ${this.nodeInfo.versionSpec}...`);
-
-      const versionInfo = await this.getInfoFromManifest(
-        this.nodeInfo.versionSpec,
-        this.nodeInfo.stable,
-        osArch,
-        manifest
-      );
-
-      if (versionInfo) {
-        core.info(
-          `Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`
-        );
-        downloadPath = await tc.downloadTool(
-          versionInfo.downloadUrl,
-          undefined,
-          this.nodeInfo.auth
+        const versionInfo = await this.getInfoFromManifest(
+          this.nodeInfo.versionSpec,
+          this.nodeInfo.stable,
+          osArch,
+          manifest
         );
+        if (versionInfo) {
+          core.info(
+            `Acquiring ${versionInfo.resolvedVersion} - ${versionInfo.arch} from ${versionInfo.downloadUrl}`
+          );
+          downloadPath = await tc.downloadTool(
+            versionInfo.downloadUrl,
+            undefined,
+            this.nodeInfo.auth
+          );
 
-        if (downloadPath) {
-          toolPath = await this.extractArchive(downloadPath, versionInfo);
+          if (downloadPath) {
+            toolPath = await this.extractArchive(downloadPath, versionInfo);
+          }
+        } else {
+          core.info(
+            'Not found in manifest. Falling back to download directly from Node'
+          );
         }
-      } else {
-        core.info(
-          'Not found in manifest. Falling back to download directly from Node'
-        );
+      } catch (err) {
+        // Rate limit?
+        if (
+          err instanceof tc.HTTPError &&
+          (err.httpStatusCode === 403 || err.httpStatusCode === 429)
+        ) {
+          core.info(
+            `Received HTTP status code ${err.httpStatusCode}. This usually indicates the rate limit has been exceeded`
+          );
+        } else {
+          core.info(err.message);
+        }
+        core.debug(err.stack);
+        core.info('Falling back to download directly from Node');
       }
-    } catch (err) {
-      // Rate limit?
-      if (
-        err instanceof tc.HTTPError &&
-        (err.httpStatusCode === 403 || err.httpStatusCode === 429)
-      ) {
-        core.info(
-          `Received HTTP status code ${err.httpStatusCode}. This usually indicates the rate limit has been exceeded`
-        );
-      } else {
-        core.info((err as Error).message);
-      }
-      core.debug((err as Error).stack ?? 'empty stack');
-      core.info('Falling back to download directly from Node');
-    }
 
-    if (!toolPath) {
-      toolPath = await this.downloadDirectlyFromNode();
+      if (!toolPath) {
+        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);
+        toolPath = await this.downloadNodejs(toolName);
+      }
     }
 
     if (this.osPlat != 'win32') {
@@ -122,43 +127,6 @@ export default class OfficialBuilds extends BaseDistribution {
     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.'
-        );
-      }
-
-      throw error;
-    }
-  }
-
   protected evaluateVersions(versions: string[]): string {
     let version = '';
 
@@ -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

@@ -75,7 +75,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);
   }
 }