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,13 +132,19 @@ 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 {
+        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) {
         logger.info(`Failed to cleanup trap caches, continuing. Details: ${e}`);
     }

src/analyze-action.ts

@@ -32,7 +32,11 @@ import {
   getActionsStatus,
   StatusReportBase,
 } from "./status-report";
-import { getTotalCacheSize, uploadTrapCaches } from "./trap-caching";
+import {
+  cleanupTrapCaches,
+  getTotalCacheSize,
+  uploadTrapCaches,
+} from "./trap-caching";
 import * as uploadLib from "./upload-lib";
 import { UploadResult } from "./upload-lib";
 import * as util from "./util";
@@ -311,6 +315,9 @@ async function run() {
     didUploadTrapCaches = await uploadTrapCaches(codeql, config, logger);
     trapCacheUploadTime = performance.now() - trapCacheUploadStartTime;
 
+    // Clean up TRAP caches
+    await 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.");

src/trap-caching.ts

@@ -161,12 +161,18 @@ export async function uploadTrapCaches(
   return true;
 }
 
-export async function cleanupTrapCaches(language: Language, logger: Logger) {
+export async function cleanupTrapCaches(config: Config, logger: Logger) {
+  if (!(await actionsUtil.isAnalyzingDefaultBranch())) return;
+
   try {
+    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) {
     logger.info(`Failed to cleanup trap caches, continuing. Details: ${e}`);
   }