mirror of
https://github.com/github/codeql-action.git
synced 2026-01-01 12:10:20 +08:00
Always log when combining queries is disabled in the repo properties
This commit is contained in:
@@ -2,7 +2,6 @@ import * as path from "path";
|
||||
|
||||
import * as semver from "semver";
|
||||
|
||||
import { isDefaultSetup } from "../actions-util";
|
||||
import * as errorMessages from "../error-messages";
|
||||
import {
|
||||
RepositoryProperties,
|
||||
@@ -392,12 +391,10 @@ function combineQueries(
|
||||
// settings. If they don't allow combining with other query configurations, return just the
|
||||
// ones configured in the repository properties.
|
||||
if (!augmentationProperties.repoPropertyQueries.combines) {
|
||||
if (!isDefaultSetup()) {
|
||||
logger.info(
|
||||
`Queries are configured in the repository properties and don't allow combining with other query settings. ` +
|
||||
`Any queries configured elsewhere will be ignored.`,
|
||||
);
|
||||
}
|
||||
logger.info(
|
||||
`The queries configured in the repository properties don't allow combining with other query settings. ` +
|
||||
`Any queries configured elsewhere will be ignored.`,
|
||||
);
|
||||
return augmentationProperties.repoPropertyQueries.input;
|
||||
} else {
|
||||
// Otherwise, add them to the query array and continue.
|
||||
|
||||
Reference in New Issue
Block a user