robojerk/codeql-action

Pass quality queries to CLI

Browse source
This commit is contained in:
Michael B. Gale 2025-06-03 11:43:33 +01:00
parent 87c547189e
commit f4c96f59d9
No known key found for this signature in database
GPG key ID: FF5E2765BD00628F
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/codeql.js generated
View file

@ -759,12 +759,13 @@ async function generateCodeScanningConfig(config, logger) {
// make a copy so we can modify it // make a copy so we can modify it
const augmentedConfig = (0, util_1.cloneObject)(config.originalUserInput); const augmentedConfig = (0, util_1.cloneObject)(config.originalUserInput);
// Inject the queries from the input // Inject the queries from the input
if (config.augmentationProperties.queriesInput) { if (config.augmentationProperties.queriesInput ||
config.augmentationProperties.qualityQueriesInput) {
if (config.augmentationProperties.queriesInputCombines) { if (config.augmentationProperties.queriesInputCombines) {
augmentedConfig.queries = (augmentedConfig.queries || []).concat(config.augmentationProperties.queriesInput); augmentedConfig.queries = (augmentedConfig.queries || []).concat(config.augmentationProperties.queriesInput || [], config.augmentationProperties.qualityQueriesInput || []);
} }
else { else {
augmentedConfig.queries = config.augmentationProperties.queriesInput; augmentedConfig.queries = (config.augmentationProperties.queriesInput || []).concat(config.augmentationProperties.qualityQueriesInput || []);
} }
} }
if (augmentedConfig.queries?.length === 0) { if (augmentedConfig.queries?.length === 0) {

2
lib/codeql.js.map
View file

File diff suppressed because one or more lines are too long

12
src/codeql.ts
View file

@ -1219,13 +1219,19 @@ async function generateCodeScanningConfig(
const augmentedConfig = cloneObject(config.originalUserInput); const augmentedConfig = cloneObject(config.originalUserInput);
// Inject the queries from the input // Inject the queries from the input
if (config.augmentationProperties.queriesInput) { if (
config.augmentationProperties.queriesInput ||
config.augmentationProperties.qualityQueriesInput
) {
if (config.augmentationProperties.queriesInputCombines) { if (config.augmentationProperties.queriesInputCombines) {
augmentedConfig.queries = (augmentedConfig.queries || []).concat( augmentedConfig.queries = (augmentedConfig.queries || []).concat(
config.augmentationProperties.queriesInput, config.augmentationProperties.queriesInput || [],
config.augmentationProperties.qualityQueriesInput || [],
); );
} else { } else {
augmentedConfig.queries = config.augmentationProperties.queriesInput; augmentedConfig.queries = (
config.augmentationProperties.queriesInput || []
).concat(config.augmentationProperties.qualityQueriesInput || []);
} }
} }
if (augmentedConfig.queries?.length === 0) { if (augmentedConfig.queries?.length === 0) {