Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6db77ee

Browse files
aeisenbergaeisenberg
committed
Merge remote-tracking branch 'upstream/main' into aeisenberg/remove-queries
2 parents 777b778 + df05122 commit 6db77ee

6 files changed

Lines changed: 54 additions & 5 deletions

File tree

‎lib/config-utils.test.js‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/config-utils.test.js.map‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/util.js.map‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/config-utils.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,3 +1919,23 @@ test(
19191919
"security-and-quality",
19201920
"0.0.1"
19211921
);
1922+
// Test that ML-powered queries are run on all platforms running `security-extended` on CodeQL
1923+
// CLI 2.9.3+.
1924+
test(
1925+
mlPoweredQueriesMacro,
1926+
"2.9.3",
1927+
true,
1928+
undefined,
1929+
"security-extended",
1930+
"~0.3.0"
1931+
);
1932+
// Test that ML-powered queries are run on all platforms running `security-and-quality` on CodeQL
1933+
// CLI 2.9.3+.
1934+
test(
1935+
mlPoweredQueriesMacro,
1936+
"2.9.3",
1937+
true,
1938+
undefined,
1939+
"security-and-quality",
1940+
"~0.3.0"
1941+
);

‎src/util.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,14 @@ export const ML_POWERED_JS_QUERIES_PACK_NAME =
668668
export async function getMlPoweredJsQueriesPack(
669669
codeQL: CodeQL
670670
): Promise<string> {
671-
const version = (await codeQlVersionAbove(codeQL, "2.8.4"))
672-
? "~0.2.0"
673-
: "~0.1.0";
671+
let version;
672+
if (await codeQlVersionAbove(codeQL, "2.9.3")) {
673+
version = `~0.3.0`;
674+
} else if (await codeQlVersionAbove(codeQL, "2.8.4")) {
675+
version = `~0.2.0`;
676+
} else {
677+
version = `~0.1.0`;
678+
}
674679
return prettyPrintPack({
675680
name: ML_POWERED_JS_QUERIES_PACK_NAME,
676681
version,

0 commit comments

Comments
 (0)