Merge c1b361d808 into 89d709d423

* Bump prettier from 2.8.8 to 3.6.2

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.6.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.6.2)

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.6.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* check failure fix

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aparna Jyothi <aparnajyothi-y@github.com>

__tests__/cache-save.test.ts

@@ -114,10 +114,10 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CachePrimaryKey || key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePaths
+            : key === State.CachePaths
-          ? '["/foo/bar"]'
+              ? '["/foo/bar"]'
-          : 'not expected'
+              : 'not expected'
       );
 
       await run();
@@ -138,10 +138,10 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CachePrimaryKey || key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePaths
+            : key === State.CachePaths
-          ? '["/foo/bar"]'
+              ? '["/foo/bar"]'
-          : 'not expected'
+              : 'not expected'
       );
 
       await run();
@@ -162,10 +162,10 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CachePrimaryKey || key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePaths
+            : key === State.CachePaths
-          ? '["/foo/bar"]'
+              ? '["/foo/bar"]'
-          : 'not expected'
+              : 'not expected'
       );
       getCommandOutputSpy.mockImplementationOnce(() => `${commonPath}/npm`);
 
@@ -184,10 +184,10 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CachePrimaryKey || key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePaths
+            : key === State.CachePaths
-          ? '["/foo/bar"]'
+              ? '["/foo/bar"]'
-          : 'not expected'
+              : 'not expected'
       );
 
       await run();
@@ -207,12 +207,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? npmFileHash
+              ? npmFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
 
       await run();
@@ -237,12 +237,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? yarnFileHash
+            ? yarnFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? npmFileHash
+              ? npmFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
 
       await run();
@@ -267,12 +267,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? npmFileHash
+            ? npmFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? yarnFileHash
+              ? yarnFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
 
       await run();
@@ -297,12 +297,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? pnpmFileHash
+            ? pnpmFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? npmFileHash
+              ? npmFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
 
       await run();
@@ -327,12 +327,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? npmFileHash
+            ? npmFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? yarnFileHash
+              ? yarnFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
       saveCacheSpy.mockImplementation(() => {
         return -1;
@@ -360,12 +360,12 @@ describe('run', () => {
         key === State.CachePackageManager
           ? inputs['cache']
           : key === State.CacheMatchedKey
-          ? npmFileHash
+            ? npmFileHash
-          : key === State.CachePrimaryKey
+            : key === State.CachePrimaryKey
-          ? yarnFileHash
+              ? yarnFileHash
-          : key === State.CachePaths
+              : key === State.CachePaths
-          ? '["/foo/bar"]'
+                ? '["/foo/bar"]'
-          : 'not expected'
+                : 'not expected'
       );
       saveCacheSpy.mockImplementation(() => {
         throw new cache.ValidationError('Validation failed');

dist/setup/index.js

@@ -99743,6 +99743,7 @@ const util_1 = __nccwpck_require__(54527);
 const constants_1 = __nccwpck_require__(27242);
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a;
         try {
             //
             // Version is optional.  If supplied, install / use from the tool cache
@@ -99761,6 +99762,10 @@ function run() {
             if (!arch) {
                 arch = os_1.default.arch();
             }
+            if ((_a = process.env.AGENT_TOOLSDIRECTORY) === null || _a === void 0 ? void 0 : _a.trim()) {
+                process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
+            }
+            core.debug(`Node is expected to be installed into ${process.env['RUNNER_TOOL_CACHE']}`);
             if (version) {
                 const token = core.getInput('token');
                 const auth = !token ? undefined : `token ${token}`;

package-lock.json

@@ -34,7 +34,7 @@
         "jest": "^29.7.0",
         "jest-circus": "^29.7.0",
         "jest-each": "^29.7.0",
-        "prettier": "^2.8.4",
+        "prettier": "^3.6.2",
         "ts-jest": "^29.4.1",
         "typescript": "^5.4.2"
       },
@@ -4962,15 +4962,16 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.8",
+      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
-        "prettier": "bin-prettier.js"
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/prettier/prettier?sponsor=1"

package.json

@@ -53,7 +53,7 @@
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "jest-each": "^29.7.0",
-    "prettier": "^2.8.4",
+    "prettier": "^3.6.2",
     "ts-jest": "^29.4.1",
     "typescript": "^5.4.2"
   }

src/cache-utils.ts

@@ -167,14 +167,12 @@ const getCacheDirectoriesFromCacheDependencyPath = async (
   packageManagerInfo: PackageManagerInfo,
   cacheDependencyPath: string
 ): Promise<string[]> => {
-  const projectDirectories = await getProjectDirectoriesFromCacheDependencyPath(
+  const projectDirectories =
-    cacheDependencyPath
+    await getProjectDirectoriesFromCacheDependencyPath(cacheDependencyPath);
-  );
   const cacheFoldersPaths = await Promise.all(
     projectDirectories.map(async projectDirectory => {
-      const cacheFolderPath = await packageManagerInfo.getCacheFolderPath(
+      const cacheFolderPath =
-        projectDirectory
+        await packageManagerInfo.getCacheFolderPath(projectDirectory);
-      );
       core.debug(
         `${packageManagerInfo.name}'s cache folder "${cacheFolderPath}" configured for the directory "${projectDirectory}"`
       );

src/distributions/official_builds/official_builds.ts

@@ -221,8 +221,8 @@ export default class OfficialBuilds extends BaseDistribution {
       alias === '*'
         ? numbered[numbered.length - 1]
         : n < 0
-        ? numbered[numbered.length - 1 + n]
+          ? numbered[numbered.length - 1 + n]
-        : aliases[alias];
+          : aliases[alias];
 
     if (!release) {
       throw new Error(

src/main.ts

@@ -37,6 +37,14 @@ export async function run() {
       arch = os.arch();
     }
 
+    if (process.env.AGENT_TOOLSDIRECTORY?.trim()) {
+      process.env['RUNNER_TOOL_CACHE'] = process.env['AGENT_TOOLSDIRECTORY'];
+    }
+
+    core.debug(
+      `Node is expected to be installed into ${process.env['RUNNER_TOOL_CACHE']}`
+    );
+
     if (version) {
       const token = core.getInput('token');
       const auth = !token ? undefined : `token ${token}`;