From d74701caa1287004f98ef32890bad346c0008c06 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 11 Mar 2026 19:31:03 +0000 Subject: [PATCH] Drive-by cleanup: Always use `--cache-cleanup` --- lib/analyze-action-post.js | 7 +------ lib/analyze-action.js | 7 +------ lib/autobuild-action.js | 7 +------ lib/init-action-post.js | 7 +------ lib/init-action.js | 7 +------ lib/resolve-environment-action.js | 7 +------ lib/setup-codeql-action.js | 7 +------ lib/upload-lib.js | 7 +------ lib/upload-sarif-action.js | 7 +------ src/codeql.ts | 21 +-------------------- 10 files changed, 10 insertions(+), 74 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 511d9e414..8c8918ebf 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -162330,7 +162330,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function getCodeQL(cmd) { if (cachedCodeQL === void 0) { cachedCodeQL = await getCodeQLForCmd(cmd, true); @@ -162626,17 +162625,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 915c176ff..3a02a7268 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -109649,7 +109649,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -109993,17 +109992,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 31accd29a..203709d0a 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -104735,7 +104735,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function getCodeQL(cmd) { if (cachedCodeQL === void 0) { cachedCodeQL = await getCodeQLForCmd(cmd, true); @@ -105031,17 +105030,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 20bce6edc..0203fade8 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -167170,7 +167170,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -167514,17 +167513,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/init-action.js b/lib/init-action.js index e070d37cf..1ccb23fc1 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -108312,7 +108312,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -108650,17 +108649,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 73013da18..626d0dc79 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -104376,7 +104376,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function getCodeQL(cmd) { if (cachedCodeQL === void 0) { cachedCodeQL = await getCodeQLForCmd(cmd, true); @@ -104672,17 +104671,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index e53a04f51..787bd8af8 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -105784,7 +105784,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -106122,17 +106121,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/upload-lib.js b/lib/upload-lib.js index e9ff6f5c1..2b14c11f3 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -108470,7 +108470,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -108814,17 +108813,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 475a52565..eda6a07f6 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -109133,7 +109133,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"; var EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -var CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; async function setupCodeQL(toolsInput, apiDetails, tempDir, variant, defaultCliVersion, features, logger, checkVersion) { try { const { @@ -109477,17 +109476,13 @@ ${output}` }); }, async databaseCleanupCluster(config, cleanupLevel) { - const cacheCleanupFlag = await codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP - ) ? "--cache-cleanup" : "--mode"; for (const language of config.languages) { const databasePath = getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]) ]; await runCli(cmd, codeqlArgs); diff --git a/src/codeql.ts b/src/codeql.ts index 0a97d6b2c..ee2773c01 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -300,19 +300,6 @@ const GHES_MOST_RECENT_DEPRECATION_DATE = "2025-06-19"; /** The CLI verbosity level to use for extraction in debug mode. */ const EXTRACTION_DEBUG_MODE_VERBOSITY = "progress++"; -/* - * Deprecated in favor of ToolsFeature. - * - * Versions of CodeQL that version-flag certain functionality in the Action. - * For convenience, please keep these in descending order. Once a version - * flag is older than the oldest supported version above, it may be removed. - */ - -/** - * Versions 2.17.1+ of the CodeQL CLI support the `--cache-cleanup` option. - */ -const CODEQL_VERSION_CACHE_CLEANUP = "2.17.1"; - /** * Set up CodeQL CLI access. * @@ -891,19 +878,13 @@ async function getCodeQLForCmd( config: Config, cleanupLevel: CleanupLevel, ): Promise { - const cacheCleanupFlag = (await util.codeQlVersionAtLeast( - this, - CODEQL_VERSION_CACHE_CLEANUP, - )) - ? "--cache-cleanup" - : "--mode"; for (const language of config.languages) { const databasePath = util.getCodeQLDatabasePath(config, language); const codeqlArgs = [ "database", "cleanup", databasePath, - `${cacheCleanupFlag}=${cleanupLevel}`, + `--cache-cleanup=${cleanupLevel}`, ...getExtraOptionsFromEnv(["database", "cleanup"]), ]; await runCli(cmd, codeqlArgs);