@@ -1024,21 +1024,17 @@ async function isTrapCachingEnabled(
10241024
10251025async function setCppTrapCachingEnvironmentVariables (
10261026 config : Config ,
1027- codeql : CodeQL ,
10281027 logger : Logger ,
10291028) : Promise < void > {
10301029 if ( config . languages . includes ( KnownLanguage . cpp ) ) {
10311030 const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING" ;
10321031 if ( process . env [ envVar ] ) {
10331032 logger . info (
1034- `Environment variable ${ envVar } already set. Not en/disabling CodeQL C++ TRAP caching support ` ,
1033+ `Environment variable ${ envVar } already set, leaving it unchanged. ` ,
10351034 ) ;
1036- } else if ( await codeQlVersionAtLeast ( codeql , "2.17.5" ) ) {
1037- logger . info ( "Enabling CodeQL C++ TRAP caching support" ) ;
1038- core . exportVariable ( envVar , "true" ) ;
10391035 } else {
1040- logger . info ( "Disabling CodeQL C++ TRAP caching support" ) ;
1041- core . exportVariable ( envVar , "false " ) ;
1036+ logger . info ( "Enabling CodeQL C++ TRAP caching support. " ) ;
1037+ core . exportVariable ( envVar , "true " ) ;
10421038 }
10431039 }
10441040}
@@ -1243,7 +1239,7 @@ export async function initConfig(
12431239 config . trapCaches = trapCaches ;
12441240 config . trapCacheDownloadTime = trapCacheDownloadTime ;
12451241
1246- await setCppTrapCachingEnvironmentVariables ( config , inputs . codeql , logger ) ;
1242+ await setCppTrapCachingEnvironmentVariables ( config , logger ) ;
12471243 }
12481244
12491245 return config ;
0 commit comments