Use hard-coded list of quality queries, rather than quality-queries input

This commit is contained in:
Michael B. Gale
2025-08-28 17:17:59 +01:00
parent 5d95d46948
commit 7b093a605f
4 changed files with 21 additions and 17 deletions

9
lib/analyze-action.js generated
View File

@@ -92678,6 +92678,7 @@ var CodeQuality = {
sarifPredicate: (name) => name.endsWith(".quality.sarif"),
sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_"
};
var codeQualityQueries = ["code-quality"];
// src/analyze.ts
var fs12 = __toESM(require("fs"));
@@ -96184,8 +96185,8 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
const queries = [];
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
queries.push(getGeneratedSuitePath(config, language));
for (const qualityQuery of config.augmentationProperties.qualityQueriesInput) {
queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses));
for (const qualityQuery of codeQualityQueries) {
queries.push(resolveQuerySuiteAlias(language, qualityQuery));
}
}
logger.startGroup(`Running queries for ${language}`);
@@ -96223,8 +96224,8 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
);
qualityAnalysisSummary = await runInterpretResults(
language,
config.augmentationProperties.qualityQueriesInput.map(
(i) => resolveQuerySuiteAlias(language, i.uses)
codeQualityQueries.map(
(i) => resolveQuerySuiteAlias(language, i)
),
qualitySarifFile,
config.debugMode,

View File

@@ -125416,6 +125416,14 @@ var import_del3 = __toESM(require_del());
var io5 = __toESM(require_io());
var import_del2 = __toESM(require_del());
// src/analyses.ts
var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => {
AnalysisKind2["CodeScanning"] = "code-scanning";
AnalysisKind2["CodeQuality"] = "code-quality";
return AnalysisKind2;
})(AnalysisKind || {});
var supportedAnalysisKinds = new Set(Object.values(AnalysisKind));
// src/autobuild.ts
var core10 = __toESM(require_core());
@@ -125559,14 +125567,6 @@ var cliErrorsConfig = {
// src/config-utils.ts
var semver4 = __toESM(require_semver2());
// src/analyses.ts
var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => {
AnalysisKind2["CodeScanning"] = "code-scanning";
AnalysisKind2["CodeQuality"] = "code-quality";
return AnalysisKind2;
})(AnalysisKind || {});
var supportedAnalysisKinds = new Set(Object.values(AnalysisKind));
// src/caching-utils.ts
var core5 = __toESM(require_core());

View File

@@ -78,3 +78,6 @@ export const CodeQuality: AnalysisConfig = {
sarifPredicate: (name) => name.endsWith(".quality.sarif"),
sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_",
};
/** The queries to use for Code Quality analyses. */
export const codeQualityQueries: string[] = ["code-quality"];

View File

@@ -12,6 +12,7 @@ import {
getTemporaryDirectory,
PullRequestBranches,
} from "./actions-util";
import * as analyses from "./analyses";
import { getApiClient } from "./api-client";
import { setupCppAutobuild } from "./autobuild";
import { type CodeQL } from "./codeql";
@@ -679,9 +680,8 @@ export async function runQueries(
configUtils.isCodeScanningEnabled(config)
) {
queries.push(util.getGeneratedSuitePath(config, language));
for (const qualityQuery of config.augmentationProperties
.qualityQueriesInput) {
queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses));
for (const qualityQuery of analyses.codeQualityQueries) {
queries.push(resolveQuerySuiteAlias(language, qualityQuery));
}
}
@@ -747,8 +747,8 @@ export async function runQueries(
);
qualityAnalysisSummary = await runInterpretResults(
language,
config.augmentationProperties.qualityQueriesInput.map((i) =>
resolveQuerySuiteAlias(language, i.uses),
analyses.codeQualityQueries.map((i) =>
resolveQuerySuiteAlias(language, i),
),
qualitySarifFile,
config.debugMode,