Skip to content

Commit 5a4aa83

Browse files
committed
Always log when combining queries is disabled in the repo properties
1 parent 54bbe82 commit 5a4aa83

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

lib/init-action.js

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/config/db-config.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as path from "path";
22

33
import * as semver from "semver";
44

5-
import { isDefaultSetup } from "../actions-util";
65
import * as errorMessages from "../error-messages";
76
import {
87
RepositoryProperties,
@@ -392,12 +391,10 @@ function combineQueries(
392391
// settings. If they don't allow combining with other query configurations, return just the
393392
// ones configured in the repository properties.
394393
if (!augmentationProperties.repoPropertyQueries.combines) {
395-
if (!isDefaultSetup()) {
396-
logger.info(
397-
`Queries are configured in the repository properties and don't allow combining with other query settings. ` +
398-
`Any queries configured elsewhere will be ignored.`,
399-
);
400-
}
394+
logger.info(
395+
`The queries configured in the repository properties don't allow combining with other query settings. ` +
396+
`Any queries configured elsewhere will be ignored.`,
397+
);
401398
return augmentationProperties.repoPropertyQueries.input;
402399
} else {
403400
// Otherwise, add them to the query array and continue.

0 commit comments

Comments
 (0)