Address PR comments from @henrymercer
This commit is contained in:
parent
e70ec1d70e
commit
fd45eac830
3 changed files with 11 additions and 5 deletions
6
lib/codeql.js
generated
6
lib/codeql.js
generated
|
|
@ -68,7 +68,8 @@ const CODEQL_MINIMUM_VERSION = "2.3.1";
|
||||||
const CODEQL_VERSION_RAM_FINALIZE = "2.5.8";
|
const CODEQL_VERSION_RAM_FINALIZE = "2.5.8";
|
||||||
const CODEQL_VERSION_DIAGNOSTICS = "2.5.6";
|
const CODEQL_VERSION_DIAGNOSTICS = "2.5.6";
|
||||||
const CODEQL_VERSION_METRICS = "2.5.5";
|
const CODEQL_VERSION_METRICS = "2.5.5";
|
||||||
const CODEQL_VERSION_GROUP_RULES = "2.5.1";
|
const CODEQL_VERSION_GROUP_RULES = "2.5.5";
|
||||||
|
const CODEQL_VERSION_SARIF_GROUP = "2.5.3";
|
||||||
function getCodeQLBundleName() {
|
function getCodeQLBundleName() {
|
||||||
let platform;
|
let platform;
|
||||||
if (process.platform === "win32") {
|
if (process.platform === "win32") {
|
||||||
|
|
@ -526,7 +527,8 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||||
codeqlArgs.push("--print-metrics-summary");
|
codeqlArgs.push("--print-metrics-summary");
|
||||||
if (await util.codeQlVersionAbove(this, CODEQL_VERSION_GROUP_RULES))
|
if (await util.codeQlVersionAbove(this, CODEQL_VERSION_GROUP_RULES))
|
||||||
codeqlArgs.push("--sarif-group-rules-by-pack");
|
codeqlArgs.push("--sarif-group-rules-by-pack");
|
||||||
if (automationDetailsId !== undefined) {
|
if (automationDetailsId !== undefined &&
|
||||||
|
(await util.codeQlVersionAbove(this, CODEQL_VERSION_SARIF_GROUP))) {
|
||||||
codeqlArgs.push("--sarif-category", automationDetailsId);
|
codeqlArgs.push("--sarif-category", automationDetailsId);
|
||||||
}
|
}
|
||||||
codeqlArgs.push(databasePath, ...querySuitePaths);
|
codeqlArgs.push(databasePath, ...querySuitePaths);
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -196,7 +196,8 @@ const CODEQL_MINIMUM_VERSION = "2.3.1";
|
||||||
const CODEQL_VERSION_RAM_FINALIZE = "2.5.8";
|
const CODEQL_VERSION_RAM_FINALIZE = "2.5.8";
|
||||||
const CODEQL_VERSION_DIAGNOSTICS = "2.5.6";
|
const CODEQL_VERSION_DIAGNOSTICS = "2.5.6";
|
||||||
const CODEQL_VERSION_METRICS = "2.5.5";
|
const CODEQL_VERSION_METRICS = "2.5.5";
|
||||||
const CODEQL_VERSION_GROUP_RULES = "2.5.1";
|
const CODEQL_VERSION_GROUP_RULES = "2.5.5";
|
||||||
|
const CODEQL_VERSION_SARIF_GROUP = "2.5.3";
|
||||||
|
|
||||||
function getCodeQLBundleName(): string {
|
function getCodeQLBundleName(): string {
|
||||||
let platform: string;
|
let platform: string;
|
||||||
|
|
@ -811,7 +812,10 @@ async function getCodeQLForCmd(
|
||||||
codeqlArgs.push("--print-metrics-summary");
|
codeqlArgs.push("--print-metrics-summary");
|
||||||
if (await util.codeQlVersionAbove(this, CODEQL_VERSION_GROUP_RULES))
|
if (await util.codeQlVersionAbove(this, CODEQL_VERSION_GROUP_RULES))
|
||||||
codeqlArgs.push("--sarif-group-rules-by-pack");
|
codeqlArgs.push("--sarif-group-rules-by-pack");
|
||||||
if (automationDetailsId !== undefined) {
|
if (
|
||||||
|
automationDetailsId !== undefined &&
|
||||||
|
(await util.codeQlVersionAbove(this, CODEQL_VERSION_SARIF_GROUP))
|
||||||
|
) {
|
||||||
codeqlArgs.push("--sarif-category", automationDetailsId);
|
codeqlArgs.push("--sarif-category", automationDetailsId);
|
||||||
}
|
}
|
||||||
codeqlArgs.push(databasePath, ...querySuitePaths);
|
codeqlArgs.push(databasePath, ...querySuitePaths);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue