github · Oct 11, 2022
diff --git a/‎lib/trap-caching.js
+5-4 b/‎lib/trap-caching.js
+5-4
diff --git a/‎lib/trap-caching.js.map
+1-1 b/‎lib/trap-caching.js.map
+1-1
diff --git a/‎lib/util.js
+3 b/‎lib/util.js
+3
diff --git a/‎lib/util.js.map
+1-1 b/‎lib/util.js.map
+1-1
diff --git a/‎node_modules/.package-lock.json
+3-3 b/‎node_modules/.package-lock.json
+3-3
diff --git a/‎node_modules/@actions/cache/README.md
+5 b/‎node_modules/@actions/cache/README.md
+5
diff --git a/‎node_modules/@actions/cache/lib/internal/cacheUtils.js
+7-1 b/‎node_modules/@actions/cache/lib/internal/cacheUtils.js
+7-1
diff --git a/‎node_modules/@actions/cache/lib/internal/cacheUtils.js.map
+1-1 b/‎node_modules/@actions/cache/lib/internal/cacheUtils.js.map
+1-1
diff --git a/‎node_modules/@actions/cache/lib/internal/downloadUtils.js
+23-3 b/‎node_modules/@actions/cache/lib/internal/downloadUtils.js
+23-3
diff --git a/‎node_modules/@actions/cache/lib/internal/downloadUtils.js.map
+1-1 b/‎node_modules/@actions/cache/lib/internal/downloadUtils.js.map
+1-1
diff --git a/‎node_modules/@actions/cache/lib/internal/tar.d.ts
+1-1 b/‎node_modules/@actions/cache/lib/internal/tar.d.ts
+1-1
diff --git a/‎node_modules/@actions/cache/lib/internal/tar.js
+38-42 b/‎node_modules/@actions/cache/lib/internal/tar.js
+38-42
diff --git a/‎node_modules/@actions/cache/lib/internal/tar.js.map
+1-1 b/‎node_modules/@actions/cache/lib/internal/tar.js.map
+1-1
diff --git a/‎node_modules/@actions/cache/lib/options.d.ts
+6 b/‎node_modules/@actions/cache/lib/options.d.ts
+6
diff --git a/‎node_modules/@actions/cache/lib/options.js
+13-1 b/‎node_modules/@actions/cache/lib/options.js
+13-1
diff --git a/‎node_modules/@actions/cache/lib/options.js.map
+1-1 b/‎node_modules/@actions/cache/lib/options.js.map
+1-1
diff --git a/‎node_modules/@actions/cache/package.json
+1-1 b/‎node_modules/@actions/cache/package.json
+1-1
diff --git a/‎package-lock.json
+7-7 b/‎package-lock.json
+7-7
diff --git a/‎package.json
+1-1 b/‎package.json
+1-1
diff --git a/‎src/trap-caching.ts
+9-9 b/‎src/trap-caching.ts
+9-9
diff --git a/‎src/util.ts
+3 b/‎src/util.ts
+3
@@ -22,7 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "@actions/artifact": "^1.0.0",
-    "@actions/cache": "^3.0.0",
+    "@actions/cache": "^3.0.4",
     "@actions/core": "^1.9.1",
     "@actions/exec": "^1.1.0",
     "@actions/github": "^4.0.0",
 
@@ -113,15 +113,15 @@ export async function downloadTrapCaches(
     logger.info(
       `Looking in Actions cache for TRAP cache with key ${preferredKey}`
     );
-    const found = await withTimeout(
-      MAX_CACHE_OPERATION_MS,
-      cache.restoreCache([cacheDir], preferredKey, [
-        await cachePrefix(codeql, language), // Fall back to any cache with the right key prefix
-      ]),
-      () => {
-        logger.info(
-          `Timed out waiting for TRAP cache download for ${language}, will continue without it`
-        );
+    const found = await cache.restoreCache(
+      [cacheDir],
+      preferredKey,
+      [
+        // Fall back to any cache with the right key prefix
+        await cachePrefix(codeql, language),
+      ],
+      {
+        segmentTimeoutInMs: MAX_CACHE_OPERATION_MS,
       }
     );
     if (found === undefined) {
 
@@ -899,6 +899,9 @@ export async function tryGetFolderBytes(
  * Run a promise for a given amount of time, and if it doesn't resolve within
  * that time, call the provided callback and then return undefined.
  *
+ * Note that this does NOT cancel the original promise, so that promise will
+ * continue in the background even after the timeout has expired.
+ *
  * @param timeoutMs The timeout in milliseconds.
  * @param promise The promise to run.
  * @param onTimeout A callback to call if the promise times out.