refactor project dirs

actions · May 19, 2023 · 8e8ef76 · 8e8ef76
1 parent 6f596e7
commit 8e8ef76
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/cache-utils.ts b/src/cache-utils.ts
@@ -289,8 +289,11 @@ export function isCacheFeatureAvailable(): boolean {
 }
 
 // a hack for further possible compatibility issues and a syntax sugar
-const getYarn3ProjectDirectoryPath = () =>
-  getCacheDirectoryPath(supportedPackageManagers.yarn2, 'yarn');
+const getYarn3ProjectDirectoryPaths = () =>
+  getCacheDirectoriesPaths(
+    supportedPackageManagers.yarn,
+    core.getInput('cache-dependency-path')
+  );
 
 // see https://yarnpkg.com/features/offline-cache
 let isYarn3OfflineCacheMemoized: boolean | null = null;
@@ -301,10 +304,11 @@ export const isYarn3OfflineCache = async (
 
   isYarn3OfflineCacheMemoized = false;
 
-  if (packageManagerInfo !== supportedPackageManagers.yarn2)
-    return isYarn3OfflineCacheMemoized;
+  if (packageManagerInfo.name !== 'yarn') return isYarn3OfflineCacheMemoized;
+
+  const cacheDependencyPath = core.getInput('cache-dependency-path');
 
-  const yarnDir = await getYarn3ProjectDirectoryPath();
+  const yarnDirs = await getYarn3ProjectDirectoryPath();
 
   const workDir = yarnDir || process.env.GITHUB_WORKSPACE!;