From 955873a98a8aba4325d594b54097dd00bd4750f9 Mon Sep 17 00:00:00 2001 From: krishanbhasin-gc Date: Fri, 21 Apr 2023 16:27:00 +0100 Subject: [PATCH] add a fallback restore-key for poetry cache --- __tests__/cache-restore.test.ts | 2 +- src/cache-distributions/poetry-cache.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts index b4b48ad21..e3cbbc430 100644 --- 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/src/cache-distributions/poetry-cache.ts b/src/cache-distributions/poetry-cache.ts index c31fb05d4..616690938 100644 --- 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}-`; return { primaryKey, - restoreKey + restoreKey: [restoreKey] }; }