DONT MERGE

threeal · Jan 29, 2023 · a116398 · a116398
1 parent 4fc2b6c
commit a116398
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -391,13 +391,16 @@ function getCacheKey(packageName) {
 async function cachePackage(packageInfo) {
     const loc = await getSitePackages();
     await cache.saveCache([
-        path.join(loc, packageInfo.name.toLowerCase()),
-        path.join(loc, `${packageInfo.name}-${packageInfo.version}.dist-info`),
+        path.join(loc, `${packageInfo.name.toLowerCase()}*`),
+        path.join(loc, `${packageInfo.name}*`),
     ], getCacheKey(packageInfo.name));
 }
 async function restorePackage(packageName) {
-    const loc = path.join(await getSitePackages(), "*");
-    const key = await cache.restoreCache([loc], getCacheKey(packageName));
+    const loc = await getSitePackages();
+    const key = await cache.restoreCache([
+        path.join(loc, `${packageName.toLowerCase()}*`),
+        path.join(loc, `${packageName}*`),
+    ], getCacheKey(packageName));
     return key !== undefined;
 }
 async function isPackageExist(packageName) {

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/deps/pip.ts b/src/deps/pip.ts
@@ -66,16 +66,22 @@ async function cachePackage(packageInfo: PackageInfo): Promise<void> {
   const loc = await getSitePackages();
   await cache.saveCache(
     [
-      path.join(loc, packageInfo.name.toLowerCase()),
-      path.join(loc, `${packageInfo.name}-${packageInfo.version}.dist-info`),
+      path.join(loc, `${packageInfo.name.toLowerCase()}*`),
+      path.join(loc, `${packageInfo.name}*`),
     ],
     getCacheKey(packageInfo.name)
   );
 }
 
 async function restorePackage(packageName: string): Promise<boolean> {
-  const loc = path.join(await getSitePackages(), "*");
-  const key = await cache.restoreCache([loc], getCacheKey(packageName));
+  const loc = await getSitePackages();
+  const key = await cache.restoreCache(
+    [
+      path.join(loc, `${packageName.toLowerCase()}*`),
+      path.join(loc, `${packageName}*`),
+    ],
+    getCacheKey(packageName)
+  );
   return key !== undefined;
 }