Merge pull request #2344 from github/sashabu/cpp-trap-cache

Remove C++ TRAP caching feature flag in favour of CLI v2.17.5 check.

lib/feature-flags.js

@@ -52,7 +52,6 @@ var Feature;
     Feature["AutobuildDirectTracing"] = "autobuild_direct_tracing_v2";
     Feature["CleanupTrapCaches"] = "cleanup_trap_caches";
     Feature["CppDependencyInstallation"] = "cpp_dependency_installation_enabled";
-    Feature["CppTrapCachingEnabled"] = "cpp_trap_caching_enabled";
     Feature["DisableCsharpBuildless"] = "disable_csharp_buildless";
     Feature["DisableJavaBuildlessEnabled"] = "disable_java_buildless_enabled";
     Feature["DisableKotlinAnalysisEnabled"] = "disable_kotlin_analysis_enabled";
@@ -77,12 +76,6 @@ exports.featureConfig = {
         legacyApi: true,
         minimumVersion: "2.15.0",
     },
-    [Feature.CppTrapCachingEnabled]: {
-        defaultValue: false,
-        envVar: "CODEQL_CPP_TRAP_CACHING",
-        legacyApi: true,
-        minimumVersion: "2.16.1",
-    },
     [Feature.DisableCsharpBuildless]: {
         defaultValue: false,
         envVar: "CODEQL_ACTION_DISABLE_CSHARP_BUILDLESS",

lib/init-action.js

@@ -274,7 +274,7 @@ async function run() {
                 logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`);
             }
             else if (getTrapCachingEnabled() &&
-                (await features.getValue(feature_flags_1.Feature.CppTrapCachingEnabled, codeql))) {
+                (await (0, util_1.codeQlVersionAtLeast)(codeql, "2.17.5"))) {
                 logger.info("Enabling CodeQL C++ TRAP caching support");
                 core.exportVariable(envVar, "true");
             }

src/feature-flags.ts

@@ -48,7 +48,6 @@ export enum Feature {
   AutobuildDirectTracing = "autobuild_direct_tracing_v2",
   CleanupTrapCaches = "cleanup_trap_caches",
   CppDependencyInstallation = "cpp_dependency_installation_enabled",
-  CppTrapCachingEnabled = "cpp_trap_caching_enabled",
   DisableCsharpBuildless = "disable_csharp_buildless",
   DisableJavaBuildlessEnabled = "disable_java_buildless_enabled",
   DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
@@ -104,12 +103,6 @@ export const featureConfig: Record<
     legacyApi: true,
     minimumVersion: "2.15.0",
   },
-  [Feature.CppTrapCachingEnabled]: {
-    defaultValue: false,
-    envVar: "CODEQL_CPP_TRAP_CACHING",
-    legacyApi: true,
-    minimumVersion: "2.16.1",
-  },
   [Feature.DisableCsharpBuildless]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_DISABLE_CSHARP_BUILDLESS",

src/init-action.ts

@@ -466,7 +466,7 @@ async function run() {
         );
       } else if (
         getTrapCachingEnabled() &&
-        (await features.getValue(Feature.CppTrapCachingEnabled, codeql))
+        (await codeQlVersionAtLeast(codeql, "2.17.5"))
       ) {
         logger.info("Enabling CodeQL C++ TRAP caching support");
         core.exportVariable(envVar, "true");