Further update to reflect a conversation with @henrymercer

This commit is contained in:
Edoardo Pirovano 2022-10-11 16:59:48 +01:00
parent 6e1dab28b6
commit adb28963c0
No known key found for this signature in database
GPG key ID: 047556B5D93FFE28
21 changed files with 131 additions and 79 deletions

9
lib/trap-caching.js generated
View file

@ -100,10 +100,11 @@ async function downloadTrapCaches(codeql, languages, logger) {
// The SHA from the base of the PR is the most similar commit we might have a cache for
const preferredKey = await cacheKey(codeql, language, baseSha);
logger.info(`Looking in Actions cache for TRAP cache with key ${preferredKey}`);
const found = await (0, util_1.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) {
// We didn't find a TRAP cache in the Actions cache, so the directory on disk is