Merge pull request #2568 from github/calumgrant/bmn-ff2

C++: Handle codeql_action_cpp_build_mode_none feature flag
github · Oct 25, 2024 · b91f43b · b91f43b
2 parents 467d7e6 + f88a648
commit b91f43b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/lib/feature-flags.js b/lib/feature-flags.js
diff --git a/lib/feature-flags.js.map b/lib/feature-flags.js.map
diff --git a/lib/init-action.js b/lib/init-action.js
diff --git a/lib/init-action.js.map b/lib/init-action.js.map
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
@@ -50,8 +50,7 @@ export interface FeatureEnablement {
 export enum Feature {
   ArtifactV4Upgrade = "artifact_v4_upgrade",
   CleanupTrapCaches = "cleanup_trap_caches",
-  CppBuildModeNoneDisabled = "cpp_build_mode_none_disabled",
-  CppBuildModeNoneEnabled = "cpp_build_mode_none",
+  CppBuildModeNone = "cpp_build_mode_none",
   CppDependencyInstallation = "cpp_dependency_installation_enabled",
   DiffInformedQueries = "diff_informed_queries",
   DisableCsharpBuildless = "disable_csharp_buildless",
@@ -105,14 +104,9 @@ export const featureConfig: Record<
     envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES",
     minimumVersion: undefined,
   },
-  [Feature.CppBuildModeNoneDisabled]: {
+  [Feature.CppBuildModeNone]: {
     defaultValue: false,
-    envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE_DISABLED",
-    minimumVersion: undefined,
-  },
-  [Feature.CppBuildModeNoneEnabled]: {
-    defaultValue: false,
-    envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE_ENABLED",
+    envVar: "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE",
     minimumVersion: undefined,
   },
   [Feature.CppDependencyInstallation]: {

diff --git a/src/init-action.ts b/src/init-action.ts
@@ -546,6 +546,16 @@ async function run() {
       }
     }
 
+    // Set CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE
+    if (config.languages.includes(Language.cpp)) {
+      const bmnVar = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
+      const value =
+        process.env[bmnVar] ||
+        (await features.getValue(Feature.CppBuildModeNone, codeql));
+      logger.info(`Setting C++ build-mode: none to ${value}`);
+      core.exportVariable(bmnVar, value);
+    }
+
     // For CLI versions <2.15.1, build tracing caused errors in MacOS ARM machines with
     // System Integrity Protection (SIP) disabled.
     if (