robojerk/codeql-action

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

Browse source
This commit is contained in:
Andrew Eisenberg 2022-06-15 17:21:05 -07:00
commit 6db77eec0d
6 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/util.js generated
View file

@ -553,6 +553,7 @@ exports.ML_POWERED_JS_QUERIES_PACK_NAME = "codeql/javascript-experimental-atm-qu
* queries beta.
*/
async function getMlPoweredJsQueriesPack(codeQL) {
<<<<<<< HEAD
const version = (await codeQlVersionAbove(codeQL, "2.8.4"))
? "~0.2.0"
: "~0.1.0";
@ -560,6 +561,15 @@ async function getMlPoweredJsQueriesPack(codeQL) {
name: exports.ML_POWERED_JS_QUERIES_PACK_NAME,
version,
});
=======
if (await codeQlVersionAbove(codeQL, "2.9.3")) {
return `${exports.ML_POWERED_JS_QUERIES_PACK_NAME}@~0.3.0`;
}
else if (await codeQlVersionAbove(codeQL, "2.8.4")) {
return `${exports.ML_POWERED_JS_QUERIES_PACK_NAME}@~0.2.0`;
}
return `${exports.ML_POWERED_JS_QUERIES_PACK_NAME}@~0.1.0`;
>>>>>>> upstream/main
}
exports.getMlPoweredJsQueriesPack = getMlPoweredJsQueriesPack;
/**