8000 Fix --qlconfig-file option · github/codeql-action@8af7c45 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8af7c45

Browse files
committed
Fix --qlconfig-file option
1 parent 6ef6e50 commit 8af7c45

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/codeql.test.ts

Lines changed: 3 additions & 3 deletions
1060
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ test("does not pass a code scanning config or qlconfig file to the CLI when CLI
10261026

10271027
// should not have passed a qlconfig file
10281028
const hasQlconfigArg = args.some((arg: string) =>
1029-
arg.startsWith("--qlconfig=")
1029+
arg.startsWith("--qlconfig-file=")
10301030
);
10311031
t.false(hasQlconfigArg, "Should NOT have passed a qlconfig file");
10321032
});
@@ -1056,7 +1056,7 @@ test("passes a code scanning config AND qlconfig to the CLI when CLI config pass
10561056

10571057
// should have passed a qlconfig file
10581058
const hasQlconfigArg = args.some((arg: string) =>
1059-
arg.startsWith("--qlconfig=")
1059+
arg.startsWith("--qlconfig-file=")
1060
);
10611061
t.truthy(hasQlconfigArg, "Should have injected a codescanning config");
10621062
});
@@ -1083,7 +1083,7 @@ test("passes a code scanning config BUT NOT a qlconfig to the CLI when CLI confi
10831083

10841084
// should have passed a qlconfig file
10851085
const hasQlconfigArg = args.some((arg: string) =>
1086-
arg.startsWith("--qlconfig=")
1086+
arg.startsWith("--qlconfig-file=")
10871087
);
10881088
t.false(hasQlconfigArg, "Should have injected a codescanning config");
10891089
});

src/codeql.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ export const CODEQL_VERSION_BETTER_RESOLVE_LANGUAGES = "2.10.3";
291291
export const CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";
292292

293293
/**
294-
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
294+
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig-file` flag in calls to `database init`.
295295
*/
296296
export const CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";
297297

@@ -621,7 +621,7 @@ export async function getCodeQLForCmd(
621621
if (
622622
await util.codeQlVersionAbove(this, CODEQL_VERSION_INIT_WITH_QLCONFIG)
623623
) {
624-
extraArgs.push(`--qlconfig=${qlconfigFile}`);
624+
extraArgs.push(`--qlconfig-file=${qlconfigFile}`);
625625
}
626626
await runTool(
627627
cmd,

0 commit comments

Comments
 (0)
0