resolve SymbolicLink (actions#809)

akv-platform · Jul 13, 2023 · c7a93de · c7a93de
1 parent 3405007
commit c7a93de
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/__tests__/cache-utils.test.ts b/__tests__/cache-utils.test.ts
@@ -23,8 +23,10 @@ describe('cache-utils', () => {
   let isFeatureAvailable: jest.SpyInstance;
   let info: jest.SpyInstance;
   let warningSpy: jest.SpyInstance;
+  let fsRealPathSyncSpy: jest.SpyInstance;
 
   beforeEach(() => {
+    console.log('::stop-commands::stoptoken');
     process.env['GITHUB_WORKSPACE'] = path.join(__dirname, 'data');
     debugSpy = jest.spyOn(core, 'debug');
     debugSpy.mockImplementation(msg => {});
@@ -35,8 +37,24 @@ describe('cache-utils', () => {
     isFeatureAvailable = jest.spyOn(cache, 'isFeatureAvailable');
 
     getCommandOutputSpy = jest.spyOn(utils, 'getCommandOutput');
+
+    fsRealPathSyncSpy = jest.spyOn(fs, 'realpathSync');
+    fsRealPathSyncSpy.mockImplementation(dirName => {
+      return dirName;
+    });
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+    jest.clearAllMocks();
+    //jest.restoreAllMocks();
   });
 
+  afterAll(async () => {
+    console.log('::stoptoken::');
+    jest.restoreAllMocks();
+  }, 100000);
+
   describe('getPackageManagerInfo', () => {
     it.each<[string, PackageManagerInfo | null]>([
       ['npm', utils.supportedPackageManagers.npm],

diff --git a/__tests__/nightly-installer.test.ts b/__tests__/nightly-installer.test.ts
@@ -95,6 +95,8 @@ describe('setup-node', () => {
         res = <INodeVersion[]>nodeTestDistRc;
       } else if (url.includes('/nightly')) {
         res = <INodeVersion[]>nodeTestDistNightly;
+      } else if (url.includes('/v8-canary')) {
+        res = <INodeVersion[]>nodeV8CanaryTestDist;
       } else {
         res = <INodeVersion[]>nodeTestDist;
       }

diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js
@@ -60556,6 +60556,7 @@ const getProjectDirectoriesFromCacheDependencyPath = (cacheDependencyPath) => __
     const existingDirectories = cacheDependenciesPaths
         .map(path_1.default.dirname)
         .filter(util_1.unique())
+        .map(dirName => fs_1.default.realpathSync(dirName))
         .filter(directory => fs_1.default.lstatSync(directory).isDirectory());
     if (!existingDirectories.length)
         core.warning(`No existing directories found containing cache-dependency-path="${cacheDependencyPath}"`);

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -71343,6 +71343,7 @@ const getProjectDirectoriesFromCacheDependencyPath = (cacheDependencyPath) => __
     const existingDirectories = cacheDependenciesPaths
         .map(path_1.default.dirname)
         .filter(util_1.unique())
+        .map(dirName => fs_1.default.realpathSync(dirName))
         .filter(directory => fs_1.default.lstatSync(directory).isDirectory());
     if (!existingDirectories.length)
         core.warning(`No existing directories found containing cache-dependency-path="${cacheDependencyPath}"`);

diff --git a/src/cache-utils.ts b/src/cache-utils.ts
@@ -144,6 +144,7 @@ const getProjectDirectoriesFromCacheDependencyPath = async (
   const existingDirectories: string[] = cacheDependenciesPaths
     .map(path.dirname)
     .filter(unique())
+    .map(dirName => fs.realpathSync(dirName))
     .filter(directory => fs.lstatSync(directory).isDirectory());
 
   if (!existingDirectories.length)