add a fallback restore-key for poetry cache

krishanbhasin-gc · krishanbhasin-gc · commit 19d454babe0a · 2023-04-24T10:45:07.000+01:00
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]
     };
   }
 

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py`
`300`	`300`	`result = 'pipenv cache is not found';`
`301`	`301`	`break;`
`302`	`302`	`case 'poetry':`
`303`		`- result = 'poetry cache is not found';`
	`303`	+ result = `Cache restored from key: ${pipFileLockHash}`;
`304`	`304`	`break;`
`305`	`305`	`}`
`306`	`306`