Merge pull request #1867 from github/henrymercer/remove-language-base…

…line-ff Enable language-specific baseline configuration on GHES
github · Sep 5, 2023 · 798e74c · 798e74c
2 parents 37d8d03 + 5150b5c
commit 798e74c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 
 ## [UNRELEASED]
 
-No user facing changes.
+- Enable improved file coverage information for GitHub Enterprise Server users. This feature is already available to github.com users. [#1867](https://github.com/github/codeql-action/pull/1867)
 
 ## 2.21.5 - 28 Aug 2023
 

diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
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/src/codeql.ts b/src/codeql.ts
@@ -325,6 +325,11 @@ export const CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED = "2.13.1";
  */
 export const CODEQL_VERSION_RESOLVE_ENVIRONMENT = "2.13.4";
 
+/**
+ * Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
+ */
+export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";
+
 /**
  * Set up CodeQL CLI access.
  *
@@ -576,7 +581,10 @@ export async function getCodeQLForCmd(
       }
 
       if (
-        await features.getValue(Feature.LanguageBaselineConfigEnabled, this)
+        await util.codeQlVersionAbove(
+          this,
+          CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
+        )
       ) {
         extraArgs.push("--calculate-language-specific-baseline");
       }

diff --git a/src/feature-flags.ts b/src/feature-flags.ts
@@ -28,11 +28,6 @@ export const CODEQL_VERSION_ANALYSIS_SUMMARY_V2 = "2.14.0";
  */
 export const CODEQL_VERSION_INTRA_LAYER_PARALLELISM = "2.14.0";
 
-/**
- * Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
- */
-export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";
-
 export interface CodeQLDefaultVersionInfo {
   cliVersion: string;
   tagName: string;
@@ -60,7 +55,6 @@ export enum Feature {
   DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
   EvaluatorIntraLayerParallelismEnabled = "evaluator_intra_layer_parallelism_enabled",
   ExportDiagnosticsEnabled = "export_diagnostics_enabled",
-  LanguageBaselineConfigEnabled = "language_baseline_config_enabled",
   MlPoweredQueriesEnabled = "ml_powered_queries_enabled",
   QaTelemetryEnabled = "qa_telemetry_enabled",
   ScalingReservedRamEnabled = "scaling_reserved_ram_enabled",
@@ -101,11 +95,6 @@ export const featureConfig: Record<
     minimumVersion: "2.12.4",
     defaultValue: true,
   },
-  [Feature.LanguageBaselineConfigEnabled]: {
-    envVar: "CODEQL_ACTION_LANGUAGE_BASELINE_CONFIG",
-    minimumVersion: CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
-    defaultValue: false,
-  },
   [Feature.MlPoweredQueriesEnabled]: {
     envVar: "CODEQL_ML_POWERED_QUERIES",
     minimumVersion: undefined,