Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
131cb1a
Suppress VS Code git limit warnings during package install
henrymercer Aug 7, 2023
45e889b
Install check-disk-space Node package
henrymercer Aug 7, 2023
c55207f
Use vendored TypeScript version for VS Code
henrymercer Aug 7, 2023
c6d2843
Pull out a dedicated status report file
henrymercer Aug 7, 2023
09ce3db
Sort interfaces and enums
henrymercer Aug 7, 2023
7dcb3e5
Include runner disk info in status report
henrymercer Aug 7, 2023
3b25789
Add runner image version to status report
henrymercer Aug 7, 2023
ba5812e
Add `ImageVersion` to safe env vars for default setup
henrymercer Aug 7, 2023
97ce1b0
Ignore test files in env vars query
henrymercer Aug 7, 2023
834f08b
Merge branch 'main' into henrymercer/disk-telemetry
henrymercer Aug 7, 2023
9a202d2
Update changelog and version after v2.21.3
github-actions[bot] Aug 8, 2023
a07ea2d
Update checked-in dependencies
github-actions[bot] Aug 8, 2023
4e9f8a2
Merge pull request #1830 from github/mergeback/v2.21.3-to-main-5b6282e0
henrymercer Aug 8, 2023
c93877b
Merge branch 'main' into henrymercer/disk-telemetry
henrymercer Aug 9, 2023
bd20e2b
Add changelog note
henrymercer Aug 9, 2023
9e4932e
Merge pull request #1825 from github/henrymercer/disk-telemetry
henrymercer Aug 9, 2023
f4eba74
Update default bundle to codeql-bundle-v2.14.2
github-actions[bot] Aug 10, 2023
fba3295
Add changelog note
github-actions[bot] Aug 10, 2023
76584bd
Simplify toolcache version number for semantically versioned bundles
henrymercer Aug 10, 2023
ceb4b69
Add changelog note
henrymercer Aug 10, 2023
6ed1ccd
Merge pull request #1832 from github/henrymercer/nicer-toolcache-vers…
henrymercer Aug 10, 2023
f5920c8
Log commands manually before executing them
henrymercer Aug 10, 2023
25a4246
Add changelog note
henrymercer Aug 10, 2023
2ec74e3
Merge pull request #1833 from github/henrymercer/print-commands
henrymercer Aug 10, 2023
1e14fd9
Merge branch 'main' into update-bundle/codeql-bundle-v2.14.2
henrymercer Aug 11, 2023
2160dd3
Merge pull request #1831 from github/update-bundle/codeql-bundle-v2.14.2
henrymercer Aug 11, 2023
9a510d9
Rename new analysis summary feature flag
henrymercer Aug 11, 2023
8a7b2e9
Enable language specific baselines via feature flag
henrymercer Aug 11, 2023
a0407a8
Add changelog note for rollout
henrymercer Aug 11, 2023
d03c744
Don't pass `--no-` flag as it doesn't exist yet
henrymercer Aug 11, 2023
ac35d7a
Merge pull request #1835 from github/henrymercer/language-baseline-co…
henrymercer Aug 14, 2023
ac49314
Merge pull request #1834 from github/henrymercer/analysis-summary-v2-ff
henrymercer Aug 14, 2023
492a68c
Merge pull request #1836 from github/henrymercer/analysis-summary-v2-ff
henrymercer Aug 14, 2023
c613917
Update changelog for v2.21.4
github-actions[bot] Aug 14, 2023
37116fb
Fix positioning of bundle update changelog note
henrymercer Aug 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename new analysis summary feature flag
  • Loading branch information
henrymercer committed Aug 11, 2023
commit 9a510d9b078a207699baa4ca847d29d8a9243800
2 changes: 1 addition & 1 deletion lib/analyze.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/analyze.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/codeql.test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.test.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions lib/feature-flags.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/feature-flags.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/analyze.ts
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ export async function runQueries(
}

if (
!(await features.getValue(Feature.NewAnalysisSummaryEnabled, codeql))
!(await features.getValue(Feature.AnalysisSummaryV2Enabled, codeql))
) {
await runPrintLinesOfCode(language);
}
Expand Down
2 changes: 1 addition & 1 deletion src/codeql.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ for (const {
"-v",
"",
stubConfig,
createFeatures(featureEnabled ? [Feature.NewAnalysisSummaryEnabled] : []),
createFeatures(featureEnabled ? [Feature.AnalysisSummaryV2Enabled] : []),
getRunnerLogger(true),
);
t.is(
Expand Down
6 changes: 3 additions & 3 deletions src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { Config } from "./config-utils";
import { EnvVar } from "./environment";
import {
CODEQL_VERSION_INTRA_LAYER_PARALLELISM,
CODEQL_VERSION_NEW_ANALYSIS_SUMMARY,
CODEQL_VERSION_ANALYSIS_SUMMARY_V2,
CodeQLDefaultVersionInfo,
Feature,
FeatureEnablement,
Expand Down Expand Up @@ -856,10 +856,10 @@ export async function getCodeQLForCmd(
} else if (await util.codeQlVersionAbove(this, "2.12.4")) {
codeqlArgs.push("--no-sarif-include-diagnostics");
}
if (await features.getValue(Feature.NewAnalysisSummaryEnabled, this)) {
if (await features.getValue(Feature.AnalysisSummaryV2Enabled, this)) {
codeqlArgs.push("--new-analysis-summary");
} else if (
await util.codeQlVersionAbove(this, CODEQL_VERSION_NEW_ANALYSIS_SUMMARY)
await util.codeQlVersionAbove(this, CODEQL_VERSION_ANALYSIS_SUMMARY_V2)
) {
codeqlArgs.push("--no-new-analysis-summary");
}
Expand Down
14 changes: 7 additions & 7 deletions src/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const CODEQL_VERSION_BUNDLE_SEMANTICALLY_VERSIONED = "2.13.4";
/**
* Versions 2.14.0+ of the CodeQL CLI support new analysis summaries.
*/
export const CODEQL_VERSION_NEW_ANALYSIS_SUMMARY = "2.14.0";
export const CODEQL_VERSION_ANALYSIS_SUMMARY_V2 = "2.14.0";

/**
* Versions 2.14.0+ of the CodeQL CLI support intra-layer parallelism (aka fine-grained parallelism) options.
Expand All @@ -48,14 +48,14 @@ export interface FeatureEnablement {
* Each value of this enum should end with `_enabled`.
*/
export enum Feature {
AnalysisSummaryV2Enabled = "analysis_summary_v2_enabled",
CliConfigFileEnabled = "cli_config_file_enabled",
CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled",
DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
EvaluatorIntraLayerParallelismEnabled = "evaluator_intra_layer_parallelism_enabled",
ExportDiagnosticsEnabled = "export_diagnostics_enabled",
MlPoweredQueriesEnabled = "ml_powered_queries_enabled",
NewAnalysisSummaryEnabled = "new_analysis_summary_enabled",
QaTelemetryEnabled = "qa_telemetry_enabled",
ScalingReservedRamEnabled = "scaling_reserved_ram_enabled",
UploadFailedSarifEnabled = "upload_failed_sarif_enabled",
Expand All @@ -65,6 +65,11 @@ export const featureConfig: Record<
Feature,
{ envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
> = {
[Feature.AnalysisSummaryV2Enabled]: {
envVar: "CODEQL_ACTION_ANALYSIS_SUMMARY_V2",
minimumVersion: CODEQL_VERSION_ANALYSIS_SUMMARY_V2,
defaultValue: false,
},
[Feature.CodeqlJavaLombokEnabled]: {
envVar: "CODEQL_JAVA_LOMBOK",
minimumVersion: "2.14.0",
Expand Down Expand Up @@ -95,11 +100,6 @@ export const featureConfig: Record<
minimumVersion: undefined,
defaultValue: false,
},
[Feature.NewAnalysisSummaryEnabled]: {
envVar: "CODEQL_ACTION_NEW_ANALYSIS_SUMMARY",
minimumVersion: CODEQL_VERSION_NEW_ANALYSIS_SUMMARY,
defaultValue: false,
},
[Feature.QaTelemetryEnabled]: {
envVar: "CODEQL_ACTION_QA_TELEMETRY",
minimumVersion: undefined,
Expand Down