mirror of
https://github.com/github/codeql-action.git
synced 2026-05-22 05:18:35 +00:00
Remove ForceOverwrite tools feature
This feature has been supported since CodeQL CLI v2.18.0, which is below the new minimum version.
This commit is contained in:
Generated
+9
-6
@@ -91336,10 +91336,6 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||
if (qlconfigFile !== void 0) {
|
||||
extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
|
||||
}
|
||||
const overwriteFlag = isSupportedToolsFeature(
|
||||
await this.getVersion(),
|
||||
"forceOverwrite" /* ForceOverwrite */
|
||||
) ? "--force-overwrite" : "--overwrite";
|
||||
const overlayDatabaseMode = config.overlayDatabaseMode;
|
||||
if (overlayDatabaseMode === "overlay" /* Overlay */) {
|
||||
const overlayChangesFile = await writeOverlayChangesFile(
|
||||
@@ -91360,7 +91356,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||
[
|
||||
"database",
|
||||
"init",
|
||||
...overlayDatabaseMode === "overlay" /* Overlay */ ? [] : [overwriteFlag],
|
||||
...overlayDatabaseMode === "overlay" /* Overlay */ ? [] : ["--force-overwrite"],
|
||||
"--db-cluster",
|
||||
config.dbLocation,
|
||||
`--source-root=${sourceRoot}`,
|
||||
@@ -91371,7 +91367,14 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||
// 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]
|
||||
//
|
||||
// Ignore `--overwrite` to avoid passing both `--force-overwrite` and `--overwrite` if
|
||||
// the user has configured `--overwrite`.
|
||||
ignoringOptions: [
|
||||
"--force-overwrite",
|
||||
"--overwrite",
|
||||
...baselineFilesOptions
|
||||
]
|
||||
})
|
||||
],
|
||||
{ stdin: externalRepositoryToken }
|
||||
|
||||
Reference in New Issue
Block a user