Skip to content

Commit 798e74c

Browse files
authored
Merge pull request #1867 from github/henrymercer/remove-language-baseline-ff
Enable language-specific baseline configuration on GHES
2 parents 37d8d03 + 5150b5c commit 798e74c

7 files changed

+19
-28
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
## [UNRELEASED]
66

7-
No user facing changes.
7+
- 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)
88

99
## 2.21.5 - 28 Aug 2023
1010

lib/codeql.js

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/feature-flags.js

+1-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/feature-flags.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codeql.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ export const CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED = "2.13.1";
325325
*/
326326
export const CODEQL_VERSION_RESOLVE_ENVIRONMENT = "2.13.4";
327327

328+
/**
329+
* Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
330+
*/
331+
export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";
332+
328333
/**
329334
* Set up CodeQL CLI access.
330335
*
@@ -576,7 +581,10 @@ export async function getCodeQLForCmd(
576581
}
577582

578583
if (
579-
await features.getValue(Feature.LanguageBaselineConfigEnabled, this)
584+
await util.codeQlVersionAbove(
585+
this,
586+
CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
587+
)
580588
) {
581589
extraArgs.push("--calculate-language-specific-baseline");
582590
}

src/feature-flags.ts

-11
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ export const CODEQL_VERSION_ANALYSIS_SUMMARY_V2 = "2.14.0";
2828
*/
2929
export const CODEQL_VERSION_INTRA_LAYER_PARALLELISM = "2.14.0";
3030

31-
/**
32-
* Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
33-
*/
34-
export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";
35-
3631
export interface CodeQLDefaultVersionInfo {
3732
cliVersion: string;
3833
tagName: string;
@@ -60,7 +55,6 @@ export enum Feature {
6055
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
6156
EvaluatorIntraLayerParallelismEnabled = "evaluator_intra_layer_parallelism_enabled",
6257
ExportDiagnosticsEnabled = "export_diagnostics_enabled",
63-
LanguageBaselineConfigEnabled = "language_baseline_config_enabled",
6458
MlPoweredQueriesEnabled = "ml_powered_queries_enabled",
6559
QaTelemetryEnabled = "qa_telemetry_enabled",
6660
ScalingReservedRamEnabled = "scaling_reserved_ram_enabled",
@@ -101,11 +95,6 @@ export const featureConfig: Record<
10195
minimumVersion: "2.12.4",
10296
defaultValue: true,
10397
},
104-
[Feature.LanguageBaselineConfigEnabled]: {
105-
envVar: "CODEQL_ACTION_LANGUAGE_BASELINE_CONFIG",
106-
minimumVersion: CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
107-
defaultValue: false,
108-
},
10998
[Feature.MlPoweredQueriesEnabled]: {
11099
envVar: "CODEQL_ML_POWERED_QUERIES",
111100
minimumVersion: undefined,

0 commit comments

Comments
 (0)