From 49141160ecf0feef9bac68120bebee5b4c83bf1f Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh <MatthijsBurgh@outlook.com> Date: Thu, 17 Nov 2022 13:26:26 +0100 Subject: [PATCH 1/3] feat(cache) use restoreKeys as backup to hit cache Fixes --- src/cache-restore.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cache-restore.ts b/src/cache-restore.ts index 7f761da44..a1b462335 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -37,11 +37,13 @@ export const restoreCache = async ( } const primaryKey = `node-cache-${platform}-${packageManager}-${fileHash}`; + const restoreKeys = [`node-cache-${platform}-${packageManager}-`]; core.debug(`primary key is ${primaryKey}`); + core.debug(`restore keys are [${restoreKeys}]`); core.saveState(State.CachePrimaryKey, primaryKey); - const cacheKey = await cache.restoreCache([cachePath], primaryKey); + const cacheKey = await cache.restoreCache([cachePath], primaryKey, restoreKeys); core.setOutput('cache-hit', Boolean(cacheKey)); if (!cacheKey) { From 7edc3bb90aee54c9e80f09346c8486262078109e Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh <MatthijsBurgh@outlook.com> Date: Fri, 18 Nov 2022 10:40:54 +0100 Subject: [PATCH 2/3] Chore(lint) cache-restore.ts --- src/cache-restore.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cache-restore.ts b/src/cache-restore.ts index a1b462335..26ace7b48 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -43,7 +43,11 @@ export const restoreCache = async ( core.saveState(State.CachePrimaryKey, primaryKey); - const cacheKey = await cache.restoreCache([cachePath], primaryKey, restoreKeys); + const cacheKey = await cache.restoreCache( + [cachePath], + primaryKey, + restoreKeys + ); core.setOutput('cache-hit', Boolean(cacheKey)); if (!cacheKey) { From da621f8780ba8d9476eb6722e6d032766d9c0c36 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh <MatthijsBurgh@outlook.com> Date: Fri, 18 Nov 2022 10:51:55 +0100 Subject: [PATCH 3/3] Update build --- dist/setup/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index aa4f708af..79a2a5a2d 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -73021,9 +73021,11 @@ exports.restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0 throw new Error('Some specified paths were not resolved, unable to cache dependencies.'); } const primaryKey = `node-cache-${platform}-${packageManager}-${fileHash}`; + const restoreKeys = [`node-cache-${platform}-${packageManager}-`]; core.debug(`primary key is ${primaryKey}`); + core.debug(`restore keys are [${restoreKeys}]`); core.saveState(constants_1.State.CachePrimaryKey, primaryKey); - const cacheKey = yield cache.restoreCache([cachePath], primaryKey); + const cacheKey = yield cache.restoreCache([cachePath], primaryKey, restoreKeys); core.setOutput('cache-hit', Boolean(cacheKey)); if (!cacheKey) { core.info(`${packageManager} cache is not found`);