Merge 09158c28ef into abb238b131

src/cache-restore.ts

@@ -44,19 +44,7 @@ export const restoreCache = async (
 
   core.saveState(State.CachePrimaryKey, primaryKey);
 
-  const isManagedByYarnBerry = await repoHasYarnBerryManagedDependencies(
+  const cacheKey = await cache.restoreCache(cachePaths, primaryKey, [keyPrefix]);
-    packageManagerInfo,
-    cacheDependencyPath
-  );
-  let cacheKey: string | undefined;
-  if (isManagedByYarnBerry) {
-    core.info(
-      'All dependencies are managed locally by yarn3, the previous cache can be used'
-    );
-    cacheKey = await cache.restoreCache(cachePaths, primaryKey, [keyPrefix]);
-  } else {
-    cacheKey = await cache.restoreCache(cachePaths, primaryKey);
-  }
 
   core.setOutput('cache-hit', Boolean(cacheKey));