@@ -49,11 +49,7 @@ import {
4949 getActionsStatus ,
5050 StatusReportBase ,
5151} from "./status-report" ;
52- import {
53- cleanupTrapCaches ,
54- TrapCacheCleanupStatusReport ,
55- uploadTrapCaches ,
56- } from "./trap-caching" ;
52+ import { uploadTrapCaches } from "./trap-caching" ;
5753import * as uploadLib from "./upload-lib" ;
5854import { UploadResult } from "./upload-lib" ;
5955import { postProcessAndUploadSarif } from "./upload-sarif" ;
@@ -86,7 +82,6 @@ async function sendStatusReport(
8682 trapCacheUploadTime : number | undefined ,
8783 dbCreationTimings : DatabaseCreationTimings | undefined ,
8884 didUploadTrapCaches : boolean ,
89- trapCacheCleanup : TrapCacheCleanupStatusReport | undefined ,
9085 dependencyCacheResults : DependencyCacheUploadStatusReport | undefined ,
9186 databaseUploadResults : DatabaseUploadResult [ ] ,
9287 logger : Logger ,
@@ -107,7 +102,6 @@ async function sendStatusReport(
107102 ...statusReportBase ,
108103 ...( stats || { } ) ,
109104 ...( dbCreationTimings || { } ) ,
110- ...( trapCacheCleanup || { } ) ,
111105 dependency_caching_upload_results : dependencyCacheResults ,
112106 database_upload_results : databaseUploadResults ,
113107 } ;
@@ -229,8 +223,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
229223 | undefined = undefined ;
230224 let runStats : QueriesStatusReport | undefined = undefined ;
231225 let config : Config | undefined = undefined ;
232- let trapCacheCleanupTelemetry : TrapCacheCleanupStatusReport | undefined =
233- undefined ;
234226 let trapCacheUploadTime : number | undefined = undefined ;
235227 let dbCreationTimings : DatabaseCreationTimings | undefined = undefined ;
236228 let didUploadTrapCaches = false ;
@@ -415,13 +407,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
415407 didUploadTrapCaches = await uploadTrapCaches ( codeql , config , logger ) ;
416408 trapCacheUploadTime = performance . now ( ) - trapCacheUploadStartTime ;
417409
418- // Clean up TRAP caches
419- trapCacheCleanupTelemetry = await cleanupTrapCaches (
420- config ,
421- features ,
422- logger ,
423- ) ;
424-
425410 // Store dependency cache(s) if dependency caching is enabled.
426411 if ( shouldStoreCache ( config . dependencyCachingEnabled ) ) {
427412 dependencyCacheResults = await uploadDependencyCaches (
@@ -471,7 +456,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
471456 trapCacheUploadTime ,
472457 dbCreationTimings ,
473458 didUploadTrapCaches ,
474- trapCacheCleanupTelemetry ,
475459 dependencyCacheResults ,
476460 databaseUploadResults ,
477461 logger ,
@@ -494,7 +478,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
494478 trapCacheUploadTime ,
495479 dbCreationTimings ,
496480 didUploadTrapCaches ,
497- trapCacheCleanupTelemetry ,
498481 dependencyCacheResults ,
499482 databaseUploadResults ,
500483 logger ,
@@ -508,7 +491,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
508491 trapCacheUploadTime ,
509492 dbCreationTimings ,
510493 didUploadTrapCaches ,
511- trapCacheCleanupTelemetry ,
512494 dependencyCacheResults ,
513495 databaseUploadResults ,
514496 logger ,
@@ -522,7 +504,6 @@ async function run(action: ActionState<["Base", "Logger", "Env", "Actions"]>) {
522504 trapCacheUploadTime ,
523505 dbCreationTimings ,
524506 didUploadTrapCaches ,
525- trapCacheCleanupTelemetry ,
526507 dependencyCacheResults ,
527508 databaseUploadResults ,
528509 logger ,
0 commit comments