add a fallback restore-key for poetry cache

actions · Apr 24, 2023 · 19d454b · 19d454b
1 parent 6db7460
commit 19d454b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts
@@ -300,7 +300,7 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
             result = 'pipenv cache is not found';
             break;
           case 'poetry':
-            result = 'poetry cache is not found';
+            result = `Cache restored from key: ${pipFileLockHash}`;
             break;
         }
 

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -66750,10 +66750,10 @@ class PoetryCache extends cache_distributor_1.default {
             const hash = yield glob.hashFiles(this.patterns);
             // "v2" is here to invalidate old caches of this cache distributor, which were created broken:
             const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-v2-${hash}`;
-            const restoreKey = undefined;
+            const restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-v2-`;
             return {
                 primaryKey,
-                restoreKey
+                restoreKey: [restoreKey]
             };
         });
     }

diff --git a/src/cache-distributions/poetry-cache.ts b/src/cache-distributions/poetry-cache.ts
@@ -48,10 +48,10 @@ class PoetryCache extends CacheDistributor {
     const hash = await glob.hashFiles(this.patterns);
     // "v2" is here to invalidate old caches of this cache distributor, which were created broken:
     const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-v2-${hash}`;
-    const restoreKey = undefined;
+    const restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}-${this.packageManager}-v2-`;
     return {
       primaryKey,
-      restoreKey
+      restoreKey: [restoreKey]
     };
   }