From f1aa4f497a55bf3d2212738286a05d145607a822 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 26 Jan 2026 18:02:58 +0000 Subject: [PATCH] Explain why we ignore extra baseline files options --- lib/analyze-action-post.js | 3 +++ lib/analyze-action.js | 3 +++ lib/autobuild-action.js | 3 +++ lib/init-action-post.js | 3 +++ lib/init-action.js | 3 +++ lib/resolve-environment-action.js | 3 +++ lib/setup-codeql-action.js | 3 +++ lib/upload-lib.js | 3 +++ lib/upload-sarif-action.js | 3 +++ src/codeql.ts | 3 +++ 10 files changed, 30 insertions(+) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index bccb69ddd..a7d480487 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -124967,6 +124967,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 735ba1127..c80deb077 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93067,6 +93067,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 1b46f3e60..e86b41e42 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -88167,6 +88167,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 39937f99e..5c1de14d3 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -129602,6 +129602,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/init-action.js b/lib/init-action.js index bf16508ec..c970552e4 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -91417,6 +91417,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index a62917f01..0d30268fe 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -87860,6 +87860,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 0a480cea1..69da4817b 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -89169,6 +89169,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 9efe1fac5..a41c4d41d 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -91889,6 +91889,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 469329222..ba69d872d 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -92439,6 +92439,9 @@ async function getCodeQLForCmd(cmd, checkVersion) { "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions] }) ], diff --git a/src/codeql.ts b/src/codeql.ts index c5c84f4d7..8e7c2bfe2 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -642,6 +642,9 @@ async function getCodeQLForCmd( "--extractor-include-aliases", ...extraArgs, ...getExtraOptionsFromEnv(["database", "init"], { + // Some user configs specify `--no-calculate-baseline` as an additional + // argument to `codeql database init`. Therefore ignore the baseline file + // options here to avoid specifying the same argument twice and erroring. ignoringOptions: ["--overwrite", ...baselineFilesOptions], }), ],