Invoke cleanup in analyze Action

lib/analyze-action.js

@@ -196,6 +196,8 @@ async function run() {
         const trapCacheUploadStartTime = perf_hooks_1.performance.now();
         didUploadTrapCaches = await (0, trap_caching_1.uploadTrapCaches)(codeql, config, logger);
         trapCacheUploadTime = perf_hooks_1.performance.now() - trapCacheUploadStartTime;
+        // Clean up TRAP caches
+        await (0, trap_caching_1.cleanupTrapCaches)(config, logger);
         // We don't upload results in test mode, so don't wait for processing
         if (util.isInTestMode()) {
             logger.debug("In test mode. Waiting for processing is disabled.");

lib/trap-caching.js

@@ -132,11 +132,17 @@ async function uploadTrapCaches(codeql, config, logger) {
     return true;
 }
 exports.uploadTrapCaches = uploadTrapCaches;
-async function cleanupTrapCaches(language, logger) {
+async function cleanupTrapCaches(config, logger) {
+    if (!(await actionsUtil.isAnalyzingDefaultBranch()))
+        return;
     try {
-        const matchingCaches = await getTrapCachesForLanguage(language);
-        for (const cache of matchingCaches) {
-            logger.info(`Matched Actions cache ${JSON.stringify(cache)}`);
+        for (const language of config.languages) {
+            if (config.trapCaches[language]) {
+                const matchingCaches = await getTrapCachesForLanguage(language);
+                for (const cache of matchingCaches) {
+                    logger.info(`Matched Actions cache ${JSON.stringify(cache)}`);
+                }
+            }
         }
     }
     catch (e) {