Merge pull request #4206 from github/mbg/set-restore-keys

Include primary cache keys as restore key

Author: mbg

lib/entry-points.js

@@ -313,6 +313,7 @@ export async function downloadDependencyCaches(
 
     const primaryKey = await cacheKey(codeql, features, language, patterns);
     const restoreKeys: string[] = [
+      primaryKey,
       await cachePrefix(codeql, features, language),
     ];
 

src/dependency-caching.ts

@@ -290,7 +290,7 @@ export async function downloadOverlayBaseDatabaseFromCache(
       actionsCache.restoreCache(
         [dbLocation],
         cacheRestoreKeyPrefix,
-        undefined,
+        [cacheRestoreKeyPrefix],
         {
           // Azure SDK download (which is the default) uses 128MB segments; see
           // https://github.com/actions/toolkit/blob/main/packages/cache/README.md.

src/overlay/caching.ts

@@ -130,7 +130,7 @@ export async function getOverlayStatus(
     await fs.promises.mkdir(path.dirname(statusFile), { recursive: true });
     const foundKey = await waitForResultWithTimeLimit(
       MAX_CACHE_OPERATION_MS,
-      actionsCache.restoreCache([statusFile], cacheKey),
+      actionsCache.restoreCache([statusFile], cacheKey, [cacheKey]),
       () => {
         logger.warning("Timed out restoring overlay status from cache.");
       },

src/overlay/status.ts

@@ -99,6 +99,7 @@ export async function downloadTrapCaches(
     const found = await waitForResultWithTimeLimit(
       MAX_CACHE_OPERATION_MS,
       actionsCache.restoreCache([cacheDir], preferredKey, [
+        preferredKey,
         // Fall back to any cache with the right key prefix
         await cachePrefix(codeql, language),
       ]),