Skip to content

Commit 0f19f0a

Browse files
committed
fix(auto-merge): Warn if no PRs could be merged
1 parent f79ba04 commit 0f19f0a

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

packages/auto-merge/src/cli.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,15 @@ async function runAction(autoMerge: AutoMerge, repositories: Repository[], pullR
6666

6767
const mergeResults = await autoMerge.mergeByMatch(regex, repositories);
6868

69-
const actedRepositories = [...approveResults, ...mergeResults].reduce((count, repository) => {
70-
return count + repository.actionResults.length;
71-
}, 0);
72-
73-
const successRepositories = [...approveResults, ...mergeResults].filter(repository => {
69+
const successCount = [...approveResults, ...mergeResults].filter(repository => {
7470
return repository.actionResults.some(result => result.error === undefined);
7571
}).length;
7672

77-
const prPluralized = pluralize('PR', successRepositories);
73+
const prPluralized = pluralize('PR', successCount);
7874
const doAction = configFileData.autoApprove ? 'Approved and merged' : 'Merged';
79-
const infoMessage = `${doAction} ${successRepositories} ${prPluralized} matching "${regex}".`;
80-
if (actedRepositories === 0) {
75+
const infoMessage = `${doAction} ${successCount} ${prPluralized} matching "${regex}".`;
76+
77+
if (successCount === 0) {
8178
logger.warn(infoMessage);
8279
} else {
8380
logger.info(infoMessage);

0 commit comments

Comments
 (0)