Remove CLI SARIF merge feature flag

src/feature-flags.ts

@@ -46,7 +46,6 @@ export interface FeatureEnablement {
  */
 export enum Feature {
   AutobuildDirectTracingEnabled = "autobuild_direct_tracing_enabled",
-  CliSarifMerge = "cli_sarif_merge_enabled",
   CombineSarifFilesDeprecationWarning = "combine_sarif_files_deprecation_warning_enabled",
   CppDependencyInstallation = "cpp_dependency_installation_enabled",
   CppTrapCachingEnabled = "cpp_trap_caching_enabled",
@@ -86,12 +85,6 @@ export const featureConfig: Record<
     toolsFeature: ToolsFeature.TraceCommandUseBuildMode,
     defaultValue: false,
   },
-  [Feature.CliSarifMerge]: {
-    envVar: "CODEQL_ACTION_CLI_SARIF_MERGE",
-    // This is guarded by a `supportsFeature` check rather than by a version check.
-    minimumVersion: undefined,
-    defaultValue: false,
-  },
   [Feature.CombineSarifFilesDeprecationWarning]: {
     envVar: "CODEQL_ACTION_COMBINE_SARIF_FILES_DEPRECATION_WARNING",
     // Independent of the CLI version.

src/upload-lib.ts

@@ -602,14 +602,12 @@ async function uploadFiles(
     validateSarifFileSchema(file, logger);
   }
 
-  let sarif = (await features.getValue(Feature.CliSarifMerge))
-    ? await combineSarifFilesUsingCLI(
-        sarifFiles,
-        gitHubVersion,
-        features,
-        logger,
-      )
-    : combineSarifFiles(sarifFiles, logger);
+  let sarif = await combineSarifFilesUsingCLI(
+    sarifFiles,
+    gitHubVersion,
+    features,
+    logger,
+  );
   sarif = await fingerprints.addFingerprints(sarif, sourceRoot, logger);
 
   sarif = populateRunAutomationDetails(