Merge remote-tracking branch 'upstream/main' into aeisenberg/remove-q…

…ueries
github · Jun 16, 2022 · 6db77ee · 6db77ee
2 parents 777b778 + df05122
commit 6db77ee
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 5 deletions.
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
@@ -1919,3 +1919,23 @@ test(
   "security-and-quality",
   "0.0.1"
 );
+// Test that ML-powered queries are run on all platforms running `security-extended` on CodeQL
+// CLI 2.9.3+.
+test(
+  mlPoweredQueriesMacro,
+  "2.9.3",
+  true,
+  undefined,
+  "security-extended",
+  "~0.3.0"
+);
+// Test that ML-powered queries are run on all platforms running `security-and-quality` on CodeQL
+// CLI 2.9.3+.
+test(
+  mlPoweredQueriesMacro,
+  "2.9.3",
+  true,
+  undefined,
+  "security-and-quality",
+  "~0.3.0"
+);
diff --git a/src/util.ts b/src/util.ts
@@ -668,9 +668,14 @@ export const ML_POWERED_JS_QUERIES_PACK_NAME =
 export async function getMlPoweredJsQueriesPack(
   codeQL: CodeQL
 ): Promise<string> {
-  const version = (await codeQlVersionAbove(codeQL, "2.8.4"))
-    ? "~0.2.0"
-    : "~0.1.0";
+  let version;
+  if (await codeQlVersionAbove(codeQL, "2.9.3")) {
+    version = `~0.3.0`;
+  } else if (await codeQlVersionAbove(codeQL, "2.8.4")) {
+    version = `~0.2.0`;
+  } else {
+    version = `~0.1.0`;
+  }
   return prettyPrintPack({
     name: ML_POWERED_JS_QUERIES_PACK_NAME,
     version,