From bab3f2b5f56cc57b8b8d89d645b18c5653ffce55 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 22 Oct 2025 12:22:55 +0100 Subject: [PATCH] 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 86e0b711e..201c36fe8 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 05f13178b..c6fb03fd5 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 963d4dee3..0ff2b98a5 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 58d883aee..5002bd465 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 0e88ccd92..eed63370d 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 b765cd397..4bad017b7 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-"));