Handle different permutations of analysis kinds in analyze action

This commit is contained in:
Michael B. Gale
2025-08-28 17:15:26 +01:00
parent 43d9bc8cb3
commit 5d95d46948
2 changed files with 62 additions and 22 deletions

31
lib/analyze-action.js generated
View File

@@ -96180,7 +96180,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
const sarifRunPropertyFlag = incrementalMode.length > 0 ? `--sarif-run-property=incrementalMode=${incrementalMode.join(",")}` : void 0;
for (const language of config.languages) {
try {
const sarifFile = path12.join(sarifFolder, `${language}.sarif`);
const sarifFile = isCodeScanningEnabled(config) ? path12.join(sarifFolder, `${language}.sarif`) : path12.join(sarifFolder, `${language}.quality.sarif`);
const queries = [];
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
queries.push(getGeneratedSuitePath(config, language));
@@ -96194,17 +96194,24 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
await codeql.databaseRunQueries(databasePath, queryFlags, queries);
logger.debug(`Finished running queries for ${language}.`);
statusReport[`analyze_builtin_queries_${language}_duration_ms`] = (/* @__PURE__ */ new Date()).getTime() - startTimeRunQueries;
logger.startGroup(`Interpreting results for ${language}`);
const startTimeInterpretResults = /* @__PURE__ */ new Date();
const analysisSummary = await runInterpretResults(
language,
void 0,
sarifFile,
config.debugMode,
automationDetailsId
);
let analysisSummary;
if (isCodeScanningEnabled(config) || isCodeQualityEnabled(config)) {
logger.startGroup(`Interpreting results for ${language}`);
let category = automationDetailsId;
if (isCodeQualityEnabled(config)) {
category = fixCodeQualityCategory(logger, automationDetailsId);
}
analysisSummary = await runInterpretResults(
language,
void 0,
sarifFile,
config.debugMode,
category
);
}
let qualityAnalysisSummary;
if (isCodeQualityEnabled(config)) {
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
logger.info(`Interpreting quality results for ${language}`);
const qualityCategory = fixCodeQualityCategory(
logger,
@@ -96227,7 +96234,9 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
const endTimeInterpretResults = /* @__PURE__ */ new Date();
statusReport[`interpret_results_${language}_duration_ms`] = endTimeInterpretResults.getTime() - startTimeInterpretResults.getTime();
logger.endGroup();
logger.info(analysisSummary);
if (analysisSummary) {
logger.info(analysisSummary);
}
if (qualityAnalysisSummary) {
logger.info(qualityAnalysisSummary);
}