diff --git a/lib/init-action.js b/lib/init-action.js index 8ff16f454..0bc5e10eb 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -86455,11 +86455,9 @@ function combineQueries(logger, config, augmentationProperties) { `Found query configuration in the repository properties (${"github-codeql-extra-queries" /* EXTRA_QUERIES */}): ${augmentationProperties.repoPropertyQueries.input.map((q) => q.uses).join(", ")}` ); 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 { result.push(...augmentationProperties.repoPropertyQueries.input); diff --git a/src/config/db-config.ts b/src/config/db-config.ts index 58e8cae45..263949354 100644 --- a/src/config/db-config.ts +++ b/src/config/db-config.ts @@ -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.