From bd5f49c7ca84addc0e53319c70d364f442a98837 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:19:35 +0100 Subject: [PATCH 1/5] Bump minimum version to 2.17.6 --- lib/analyze-action-post.js | 2 +- lib/analyze-action.js | 2 +- lib/autobuild-action.js | 2 +- lib/init-action-post.js | 2 +- lib/init-action.js | 2 +- lib/resolve-environment-action.js | 2 +- lib/setup-codeql-action.js | 2 +- lib/upload-lib.js | 2 +- lib/upload-sarif-action.js | 2 +- src/codeql.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 7fd5d7df08..751ece43f9 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -119416,7 +119416,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 8b936b19d2..86e0b711ec 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -92766,7 +92766,7 @@ async function endTracingForCluster(codeql, config, logger) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index f2aa1ddffb..3b16d71c3f 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -80467,7 +80467,7 @@ async function endTracingForCluster(codeql, config, logger) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index b2de76f433..05f13178b9 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -130718,7 +130718,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/init-action.js b/lib/init-action.js index 18e350024c..ae3b8a882e 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -91062,7 +91062,7 @@ async function getCombinedTracerConfig(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index e0474b9a5c..78a7bbd720 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -80166,7 +80166,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 37fc43ec6d..76b8fe1888 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -87997,7 +87997,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index a952f35ab4..963d4dee36 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -90549,7 +90549,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 9596cc4512..58d883aee5 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -91222,7 +91222,7 @@ async function shouldEnableIndirectTracing(codeql, config) { // src/codeql.ts var cachedCodeQL = void 0; -var CODEQL_MINIMUM_VERSION = "2.16.6"; +var CODEQL_MINIMUM_VERSION = "2.17.6"; var CODEQL_NEXT_MINIMUM_VERSION = "2.17.6"; var GHES_VERSION_MOST_RECENTLY_DEPRECATED = "3.13"; var GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; diff --git a/src/codeql.ts b/src/codeql.ts index a5e6c4c06d..1f5faa5828 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -267,7 +267,7 @@ let cachedCodeQL: CodeQL | undefined = undefined; * The version flags below can be used to conditionally enable certain features * on versions newer than this. */ -const CODEQL_MINIMUM_VERSION = "2.16.6"; +const CODEQL_MINIMUM_VERSION = "2.17.6"; /** * This version will shortly become the oldest version of CodeQL that the Action will run with. From 9924f476bafa62d74dd9baef869265aa9d99f930 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:20:17 +0100 Subject: [PATCH 2/5] Add changelog note --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0e85befa0..5e88056de1 100644 --- 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. +- Bump minimum CodeQL bundle version to 2.17.6. [#3223](https://github.com/github/codeql-action/pull/3223) ## 4.30.9 - 17 Oct 2025 From bab3f2b5f56cc57b8b8d89d645b18c5653ffce55 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:22:55 +0100 Subject: [PATCH 3/5] Remove `sarifMergeRunsFromEqualCategory` FF --- lib/analyze-action.js | 18 ------------------ lib/init-action-post.js | 18 ------------------ lib/upload-lib.js | 18 ------------------ lib/upload-sarif-action.js | 18 ------------------ src/tools-features.ts | 1 - src/upload-lib.ts | 27 --------------------------- 6 files changed, 100 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 86e0b711ec..201c36fe81 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -95611,24 +95611,6 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo ); codeQL = initCodeQLResult.codeql; } - if (!await codeQL.supportsFeature( - "sarifMergeRunsFromEqualCategory" /* SarifMergeRunsFromEqualCategory */ - )) { - await throwIfCombineSarifFilesDisabled(sarifObjects, gitHubVersion); - logger.warning( - "The CodeQL CLI does not support merging SARIF files. Merging files in the action." - ); - if (await shouldShowCombineSarifFilesDeprecationWarning( - sarifObjects, - gitHubVersion - )) { - logger.warning( - `Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}` - ); - core13.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true"); - } - return combineSarifFiles(sarifFiles, logger); - } const baseTempDir = path18.resolve(tempDir, "combined-sarif"); fs18.mkdirSync(baseTempDir, { recursive: true }); const outputDirectory = fs18.mkdtempSync(path18.resolve(baseTempDir, "output-")); diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 05f13178b9..c6fb03fd5b 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -133084,24 +133084,6 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo ); codeQL = initCodeQLResult.codeql; } - if (!await codeQL.supportsFeature( - "sarifMergeRunsFromEqualCategory" /* SarifMergeRunsFromEqualCategory */ - )) { - await throwIfCombineSarifFilesDisabled(sarifObjects, gitHubVersion); - logger.warning( - "The CodeQL CLI does not support merging SARIF files. Merging files in the action." - ); - if (await shouldShowCombineSarifFilesDeprecationWarning( - sarifObjects, - gitHubVersion - )) { - logger.warning( - `Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}` - ); - core14.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true"); - } - return combineSarifFiles(sarifFiles, logger); - } const baseTempDir = path17.resolve(tempDir, "combined-sarif"); fs17.mkdirSync(baseTempDir, { recursive: true }); const outputDirectory = fs17.mkdtempSync(path17.resolve(baseTempDir, "output-")); diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 963d4dee36..0ff2b98a53 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92439,24 +92439,6 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo ); codeQL = initCodeQLResult.codeql; } - if (!await codeQL.supportsFeature( - "sarifMergeRunsFromEqualCategory" /* SarifMergeRunsFromEqualCategory */ - )) { - await throwIfCombineSarifFilesDisabled(sarifObjects, gitHubVersion); - logger.warning( - "The CodeQL CLI does not support merging SARIF files. Merging files in the action." - ); - if (await shouldShowCombineSarifFilesDeprecationWarning( - sarifObjects, - gitHubVersion - )) { - logger.warning( - `Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}` - ); - core11.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true"); - } - return combineSarifFiles(sarifFiles, logger); - } const baseTempDir = path14.resolve(tempDir, "combined-sarif"); fs13.mkdirSync(baseTempDir, { recursive: true }); const outputDirectory = fs13.mkdtempSync(path14.resolve(baseTempDir, "output-")); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 58d883aee5..5002bd465a 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -93112,24 +93112,6 @@ async function combineSarifFilesUsingCLI(sarifFiles, gitHubVersion, features, lo ); codeQL = initCodeQLResult.codeql; } - if (!await codeQL.supportsFeature( - "sarifMergeRunsFromEqualCategory" /* SarifMergeRunsFromEqualCategory */ - )) { - await throwIfCombineSarifFilesDisabled(sarifObjects, gitHubVersion); - logger.warning( - "The CodeQL CLI does not support merging SARIF files. Merging files in the action." - ); - if (await shouldShowCombineSarifFilesDeprecationWarning( - sarifObjects, - gitHubVersion - )) { - logger.warning( - `Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}` - ); - core12.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true"); - } - return combineSarifFiles(sarifFiles, logger); - } const baseTempDir = path15.resolve(tempDir, "combined-sarif"); fs14.mkdirSync(baseTempDir, { recursive: true }); const outputDirectory = fs14.mkdtempSync(path15.resolve(baseTempDir, "output-")); diff --git a/src/tools-features.ts b/src/tools-features.ts index 0e88ccd92f..eed63370d9 100644 --- a/src/tools-features.ts +++ b/src/tools-features.ts @@ -9,7 +9,6 @@ export enum ToolsFeature { ForceOverwrite = "forceOverwrite", IndirectTracingSupportsStaticBinaries = "indirectTracingSupportsStaticBinaries", PythonDefaultIsToNotExtractStdlib = "pythonDefaultIsToNotExtractStdlib", - SarifMergeRunsFromEqualCategory = "sarifMergeRunsFromEqualCategory", } /** diff --git a/src/upload-lib.ts b/src/upload-lib.ts index b765cd3977..4bad017b7b 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -21,7 +21,6 @@ import * as gitUtils from "./git-utils"; import { initCodeQL } from "./init"; import { Logger } from "./logging"; import { getRepositoryNwo, RepositoryNwo } from "./repository"; -import { ToolsFeature } from "./tools-features"; import * as util from "./util"; import { ConfigurationError, @@ -269,32 +268,6 @@ async function combineSarifFilesUsingCLI( codeQL = initCodeQLResult.codeql; } - if ( - !(await codeQL.supportsFeature( - ToolsFeature.SarifMergeRunsFromEqualCategory, - )) - ) { - await throwIfCombineSarifFilesDisabled(sarifObjects, gitHubVersion); - - logger.warning( - "The CodeQL CLI does not support merging SARIF files. Merging files in the action.", - ); - - if ( - await shouldShowCombineSarifFilesDeprecationWarning( - sarifObjects, - gitHubVersion, - ) - ) { - logger.warning( - `Uploading multiple CodeQL runs with the same category is deprecated ${deprecationWarningMessage} for CodeQL CLI 2.16.6 and earlier. Please update your CodeQL CLI version or update your workflow to set a distinct category for each CodeQL run. ${deprecationMoreInformationMessage}`, - ); - core.exportVariable("CODEQL_MERGE_SARIF_DEPRECATION_WARNING", "true"); - } - - return combineSarifFiles(sarifFiles, logger); - } - const baseTempDir = path.resolve(tempDir, "combined-sarif"); fs.mkdirSync(baseTempDir, { recursive: true }); const outputDirectory = fs.mkdtempSync(path.resolve(baseTempDir, "output-")); From 39345938628b2ae586a273a22e20909aafc5a193 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:25:25 +0100 Subject: [PATCH 4/5] Remove `analysisSummaryV2Default` FF --- lib/analyze-action-post.js | 6 --- lib/analyze-action.js | 6 --- lib/autobuild-action.js | 6 --- lib/init-action-post.js | 6 --- lib/init-action.js | 6 --- lib/resolve-environment-action.js | 6 --- lib/setup-codeql-action.js | 6 --- lib/upload-lib.js | 6 --- lib/upload-sarif-action.js | 6 --- src/codeql.test.ts | 79 ------------------------------- src/codeql.ts | 8 ---- src/tools-features.ts | 1 - 12 files changed, 142 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 751ece43f9..c306d9d164 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -119703,12 +119703,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 201c36fe81..a83bcaeb94 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93101,12 +93101,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 3b16d71c3f..a5260ba408 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -80754,12 +80754,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/init-action-post.js b/lib/init-action-post.js index c6fb03fd5b..28226f1169 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -131053,12 +131053,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/init-action.js b/lib/init-action.js index ae3b8a882e..977b3d0ab0 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -91391,12 +91391,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 78a7bbd720..c5824114fe 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -80453,12 +80453,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 76b8fe1888..4d69f31a9b 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -88326,12 +88326,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 0ff2b98a53..cf3f217fa5 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -90884,12 +90884,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 5002bd465a..b6cf4c2ba2 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -91557,12 +91557,6 @@ ${output}` } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if (!isSupportedToolsFeature( - await this.getVersion(), - "analysisSummaryV2Default" /* AnalysisSummaryV2IsDefault */ - )) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/src/codeql.test.ts b/src/codeql.test.ts index 24d88069b8..3a259a8eca 100644 --- a/src/codeql.test.ts +++ b/src/codeql.test.ts @@ -36,7 +36,6 @@ import { createTestConfig, } from "./testing-utils"; import { ToolsDownloadStatusReport } from "./tools-download"; -import { ToolsFeature } from "./tools-features"; import * as util from "./util"; import { initializeEnvironment } from "./util"; @@ -870,84 +869,6 @@ test("does not pass a qlconfig to the CLI when it is undefined", async (t: Execu }); }); -const NEW_ANALYSIS_SUMMARY_TEST_CASES = [ - { - codeqlVersion: makeVersionInfo("2.15.0", { - [ToolsFeature.AnalysisSummaryV2IsDefault]: true, - }), - githubVersion: { - type: util.GitHubVariant.DOTCOM, - }, - flagPassed: false, - negativeFlagPassed: false, - }, - { - codeqlVersion: makeVersionInfo("2.15.0"), - githubVersion: { - type: util.GitHubVariant.DOTCOM, - }, - flagPassed: true, - negativeFlagPassed: false, - }, - { - codeqlVersion: makeVersionInfo("2.15.0"), - githubVersion: { - type: util.GitHubVariant.GHES, - version: "3.10.0", - }, - flagPassed: true, - negativeFlagPassed: false, - }, -]; - -for (const { - codeqlVersion, - flagPassed, - githubVersion, - negativeFlagPassed, -} of NEW_ANALYSIS_SUMMARY_TEST_CASES) { - test(`database interpret-results passes ${ - flagPassed - ? "--new-analysis-summary" - : negativeFlagPassed - ? "--no-new-analysis-summary" - : "nothing" - } for CodeQL version ${JSON.stringify(codeqlVersion)} and ${ - util.GitHubVariant[githubVersion.type] - } ${githubVersion.version ? ` ${githubVersion.version}` : ""}`, async (t) => { - const runnerConstructorStub = stubToolRunnerConstructor(); - const codeqlObject = await codeql.getCodeQLForTesting(); - sinon.stub(codeqlObject, "getVersion").resolves(codeqlVersion); - // io throws because of the test CodeQL object. - sinon.stub(io, "which").resolves(""); - await codeqlObject.databaseInterpretResults( - "", - [], - "", - "", - "", - "-v", - undefined, - "", - Object.assign({}, stubConfig, { gitHubVersion: githubVersion }), - createFeatures([]), - ); - const actualArgs = runnerConstructorStub.firstCall.args[1] as string[]; - t.is( - actualArgs.includes("--new-analysis-summary"), - flagPassed, - `--new-analysis-summary should${flagPassed ? "" : "n't"} be passed`, - ); - t.is( - actualArgs.includes("--no-new-analysis-summary"), - negativeFlagPassed, - `--no-new-analysis-summary should${ - negativeFlagPassed ? "" : "n't" - } be passed`, - ); - }); -} - test("runTool summarizes several fatal errors", async (t) => { const heapError = "A fatal error occurred: Evaluator heap must be at least 384.00 MiB"; diff --git a/src/codeql.ts b/src/codeql.ts index 1f5faa5828..5a7708fbdb 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -860,14 +860,6 @@ export async function getCodeQLForCmd( } else { codeqlArgs.push("--no-sarif-include-diagnostics"); } - if ( - !isSupportedToolsFeature( - await this.getVersion(), - ToolsFeature.AnalysisSummaryV2IsDefault, - ) - ) { - codeqlArgs.push("--new-analysis-summary"); - } codeqlArgs.push(databasePath); if (querySuitePaths) { codeqlArgs.push(...querySuitePaths); diff --git a/src/tools-features.ts b/src/tools-features.ts index eed63370d9..01f9569c12 100644 --- a/src/tools-features.ts +++ b/src/tools-features.ts @@ -3,7 +3,6 @@ import * as semver from "semver"; import type { VersionInfo } from "./codeql"; export enum ToolsFeature { - AnalysisSummaryV2IsDefault = "analysisSummaryV2Default", BuiltinExtractorsSpecifyDefaultQueries = "builtinExtractorsSpecifyDefaultQueries", DatabaseInterpretResultsSupportsSarifRunProperty = "databaseInterpretResultsSupportsSarifRunProperty", ForceOverwrite = "forceOverwrite", From 3cd3374657a08e9f7f9a976be737460517e34526 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:27:15 +0100 Subject: [PATCH 5/5] Bump minor version number --- lib/analyze-action-post.js | 2 +- lib/analyze-action.js | 2 +- lib/autobuild-action.js | 2 +- lib/init-action-post.js | 2 +- lib/init-action.js | 2 +- lib/resolve-environment-action.js | 2 +- lib/setup-codeql-action.js | 2 +- lib/start-proxy-action-post.js | 2 +- lib/start-proxy-action.js | 2 +- lib/upload-lib.js | 2 +- lib/upload-sarif-action-post.js | 2 +- lib/upload-sarif-action.js | 2 +- package.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index c306d9d164..b97fd13311 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -26460,7 +26460,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/analyze-action.js b/lib/analyze-action.js index a83bcaeb94..763698edc6 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -32309,7 +32309,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index a5260ba408..0c6293898f 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -26460,7 +26460,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 28226f1169..54154b22c2 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -32309,7 +32309,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/init-action.js b/lib/init-action.js index 977b3d0ab0..91848f51ae 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -32309,7 +32309,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index c5824114fe..18c8c6221e 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -26460,7 +26460,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 4d69f31a9b..694e43deea 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -32309,7 +32309,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index b224695c4b..e0d45ceed9 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -26460,7 +26460,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index dc17468b85..7e70a6f0f7 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -44996,7 +44996,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/upload-lib.js b/lib/upload-lib.js index cf3f217fa5..2ed5bc5652 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -33606,7 +33606,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 17777d3b8f..de01e73ee4 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -26460,7 +26460,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index b6cf4c2ba2..917238a5fd 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -32309,7 +32309,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "4.30.10", + version: "4.31.0", private: true, description: "CodeQL action", scripts: { diff --git a/package.json b/package.json index e22be7e34f..874676032e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "4.30.10", + "version": "4.31.0", "private": true, "description": "CodeQL action", "scripts": {