From 9de90d2338066082b2e828542879e25894abbb8e Mon Sep 17 00:00:00 2001 From: Arpad Borsos Date: Tue, 13 Oct 2020 14:01:46 +0200 Subject: [PATCH] only pre-clean when something was restored --- dist/restore/index.js | 10 +++++----- src/restore.ts | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index 0333114..9947e7d 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -54800,15 +54800,15 @@ async function run() { if (restoreKey) { core.info(`Restored from cache key "${restoreKey}".`); core.saveState(stateKey, restoreKey); + if (restoreKey !== key) { + // pre-clean the target directory on cache mismatch + const packages = await getPackages(); + await cleanTarget(packages); + } } else { core.info("No cache found."); } - if (restoreKey !== key) { - // pre-clean the target directory on cache mismatch - const packages = await getPackages(); - await cleanTarget(packages); - } } catch (e) { core.info(`[warning] ${e.message}`); diff --git a/src/restore.ts b/src/restore.ts index dc46829..16d7cb8 100644 --- a/src/restore.ts +++ b/src/restore.ts @@ -20,16 +20,16 @@ async function run() { if (restoreKey) { core.info(`Restored from cache key "${restoreKey}".`); core.saveState(stateKey, restoreKey); + + if (restoreKey !== key) { + // pre-clean the target directory on cache mismatch + const packages = await getPackages(); + + await cleanTarget(packages); + } } else { core.info("No cache found."); } - - if (restoreKey !== key) { - // pre-clean the target directory on cache mismatch - const packages = await getPackages(); - - await cleanTarget(packages); - } } catch (e) { core.info(`[warning] ${e.message}`); }