TRAP Caching: Re-introduce workaround for download timeout

github · Nov 16, 2022 · 6f663d7 · 6f663d7
1 parent c939e66
commit 6f663d7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/lib/trap-caching.js b/lib/trap-caching.js
diff --git a/lib/trap-caching.js.map b/lib/trap-caching.js.map
diff --git a/src/trap-caching.ts b/src/trap-caching.ts
@@ -113,15 +113,16 @@ export async function downloadTrapCaches(
     logger.info(
       `Looking in Actions cache for TRAP cache with key ${preferredKey}`
     );
-    const found = await cache.restoreCache(
-      [cacheDir],
-      preferredKey,
-      [
+    const found = await withTimeout(
+      MAX_CACHE_OPERATION_MS,
+      cache.restoreCache([cacheDir], preferredKey, [
         // Fall back to any cache with the right key prefix
         await cachePrefix(codeql, language),
-      ],
-      {
-        segmentTimeoutInMs: MAX_CACHE_OPERATION_MS,
+      ]),
+      () => {
+        logger.info(
+          `Timed out downloading cache for ${language}, will continue without it`
+        );
       }
     );
     if (found === undefined) {