fix: cache restore failures (#136)

stevenh · web-flow · commit 5e9fae966ff7 · 2023-05-11T09:01:27.000+02:00
Fix cache restore failures to to upstream bug. Fixes #119
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -60403,7 +60403,10 @@ async function run() {
         lib_core.saveState(config_STATE_BINS, JSON.stringify([...bins]));
         lib_core.info(`... Restoring cache ...`);
         const key = config.cacheKey;
-        const restoreKey = await cache.restoreCache(config.cachePaths, key, [config.restoreKey]);
+        // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+        // https://github.com/actions/toolkit/pull/1378
+        // TODO: remove this once the underlying bug is fixed.
+        const restoreKey = await cache.restoreCache(config.cachePaths.slice(), key, [config.restoreKey]);
         if (restoreKey) {
             lib_core.info(`Restored from cache key "${restoreKey}".`);
             lib_core.saveState(STATE_KEY, restoreKey);
diff --git a/dist/save/index.js b/dist/save/index.js
@@ -60434,7 +60434,10 @@ async function run() {
             core.info(`[warning] ${e.stack}`);
         }
         core.info(`... Saving cache ...`);
-        await cache.saveCache(config.cachePaths, config.cacheKey);
+        // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+        // https://github.com/actions/toolkit/pull/1378
+        // TODO: remove this once the underlying bug is fixed.
+        await cache.saveCache(config.cachePaths.slice(), config.cacheKey);
     }
     catch (e) {
         core.info(`[warning] ${e.stack}`);
diff --git a/src/restore.ts b/src/restore.ts
@@ -34,7 +34,10 @@ async function run() {
 
     core.info(`... Restoring cache ...`);
     const key = config.cacheKey;
-    const restoreKey = await cache.restoreCache(config.cachePaths, key, [config.restoreKey]);
+    // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+    // https://github.com/actions/toolkit/pull/1378
+    // TODO: remove this once the underlying bug is fixed.
+    const restoreKey = await cache.restoreCache(config.cachePaths.slice(), key, [config.restoreKey]);
     if (restoreKey) {
       core.info(`Restored from cache key "${restoreKey}".`);
       core.saveState(STATE_KEY, restoreKey);
diff --git a/src/save.ts b/src/save.ts
@@ -66,7 +66,10 @@ async function run() {
     }
 
     core.info(`... Saving cache ...`);
-    await cache.saveCache(config.cachePaths, config.cacheKey);
+    // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+    // https://github.com/actions/toolkit/pull/1378
+    // TODO: remove this once the underlying bug is fixed.
+    await cache.saveCache(config.cachePaths.slice(), config.cacheKey);
   } catch (e) {
     core.info(`[warning] ${(e as any).stack}`);
   }

Original file line number	Diff line number	Diff line change
`@@ -60434,7 +60434,10 @@ async function run() {`
`60434`	`60434`	core.info(`[warning] ${e.stack}`);
`60435`	`60435`	`}`
`60436`	`60436`	core.info(`... Saving cache ...`);
`60437`		`- await cache.saveCache(config.cachePaths, config.cacheKey);`
	`60437`	`+ // Pass a copy of cachePaths to avoid mutating the original array as reported by:`
	`60438`	`+ // https://github.com/actions/toolkit/pull/1378`
	`60439`	`+ // TODO: remove this once the underlying bug is fixed.`
	`60440`	`+ await cache.saveCache(config.cachePaths.slice(), config.cacheKey);`
`60438`	`60441`	`}`
`60439`	`60442`	`catch (e) {`
`60440`	`60443`	core.info(`[warning] ${e.stack}`);
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,10 @@ async function run() {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	core.info(`... Saving cache ...`);
`69`		`- await cache.saveCache(config.cachePaths, config.cacheKey);`
	`69`	`+ // Pass a copy of cachePaths to avoid mutating the original array as reported by:`
	`70`	`+ // https://github.com/actions/toolkit/pull/1378`
	`71`	`+ // TODO: remove this once the underlying bug is fixed.`
	`72`	`+ await cache.saveCache(config.cachePaths.slice(), config.cacheKey);`
`70`	`73`	`} catch (e) {`
`71`	`74`	core.info(`[warning] ${(e as any).stack}`);
`72`	`75`	`}`