github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-04-08 21:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle different permutations of analysis kinds in analyze action

Browse Source
This commit is contained in:
Michael B. Gale
2025-08-28 17:15:26 +01:00
parent e4ffe6f3e5
commit ff57bbf22c
2 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/analyze-action.js generated
View File

@@ -93598,7 +93598,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 = path16.join(sarifFolder, `${language}.sarif`);
const sarifFile = isCodeScanningEnabled(config) ? path16.join(sarifFolder, `${language}.sarif`) : path16.join(sarifFolder, `${language}.quality.sarif`);
const queries = [];
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
queries.push(getGeneratedSuitePath(config, language));
@@ -93612,17 +93612,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,
@@ -93645,7 +93652,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);
}

53
src/analyze.ts
View File

@@ -652,7 +652,11 @@ export async function runQueries(
for (const language of config.languages) {
try {
const sarifFile = path.join(sarifFolder, `${language}.sarif`);
// If Code Scanning is enabled, then the main SARIF file is always the Code Scanning one.
// Otherwise, only Code Quality is enabled, and the main SARIF file is the Code Quality one.
const sarifFile = configUtils.isCodeScanningEnabled(config)
? path.join(sarifFolder, `${language}.sarif`)
: path.join(sarifFolder, `${language}.quality.sarif`);
// This should be empty to run only the query suite that was generated when
// the database was initialised.
@@ -687,18 +691,43 @@ export async function runQueries(
statusReport[`analyze_builtin_queries_${language}_duration_ms`] =
new Date().getTime() - startTimeRunQueries;
logger.startGroup(`Interpreting results for ${language}`);
const startTimeInterpretResults = new Date();
const analysisSummary = await runInterpretResults(
language,
undefined,
sarifFile,
config.debugMode,
automationDetailsId,
);
// If only one analysis kind is enabled, then the database is initialised for the
// respective set of queries. Therefore, running `interpret-results` produces the
// SARIF file we want for the one enabled analysis kind.
let analysisSummary: string | undefined;
if (
configUtils.isCodeScanningEnabled(config) ||
configUtils.isCodeQualityEnabled(config)
) {
logger.startGroup(`Interpreting results for ${language}`);
// If this is a Code Quality analysis, correct the category to one
// accepted by the Code Quality backend.
let category = automationDetailsId;
if (configUtils.isCodeQualityEnabled(config)) {
category = fixCodeQualityCategory(logger, automationDetailsId);
}
analysisSummary = await runInterpretResults(
language,
undefined,
sarifFile,
config.debugMode,
category,
);
}
// This case is only needed if Code Quality is enabled in addition to Code Scanning.
// In this case, we will have run queries for both analysis kinds. The previous call to
// `interpret-results` will have produced a SARIF file for Code Scanning and we now
// need to produce an additional SARIF file for Code Quality.
let qualityAnalysisSummary: string | undefined;
if (configUtils.isCodeQualityEnabled(config)) {
if (
configUtils.isCodeQualityEnabled(config) &&
configUtils.isCodeScanningEnabled(config)
) {
logger.info(`Interpreting quality results for ${language}`);
const qualityCategory = fixCodeQualityCategory(
logger,
@@ -722,8 +751,10 @@ export async function runQueries(
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);
}