Skip to content

Commit 12f22f9

Browse files
committed
chore: re-throw errors as AggregateErrors
Keeps error stack traces.
1 parent 1980083 commit 12f22f9

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

lib/core.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ const {
22
getOctokit
33
} = require('./recorder');
44

5+
const AggregateError = require('aggregate-error');
6+
57
const DEFAULT_MIN_APPROVALS = 1;
68

79
const CONFIG_FILE = 'merge-me.yml';
@@ -274,7 +276,7 @@ async function getCollaboratorReviews(context, pullRequest) {
274276
continue;
275277
}
276278

277-
throw error;
279+
throw new AggregateError([ error ]);
278280
}
279281
}
280282

@@ -687,7 +689,7 @@ async function merge(context, pullRequest) {
687689

688690
return false;
689691
} else {
690-
throw error;
692+
throw new AggregateError([ error ]);
691693
}
692694
}
693695
}
@@ -720,7 +722,7 @@ async function checkMerge(context, pullRequest) {
720722
} else if (isMergeCheckError(error)) {
721723
context.log.debug(ctx, `skipping: ${error.message}`);
722724
} else {
723-
throw error;
725+
throw new AggregateError([ error ]);
724726
}
725727
}
726728

@@ -950,7 +952,7 @@ async function getTeamsWithMembers(context, pullRequest, reviewTeams) {
950952
throw MergeCheckError(`failed to fetch team ${teamSlug}`);
951953
}
952954

953-
throw error;
955+
throw new AggregateError([ error ]);
954956
});
955957

956958
return members;

package-lock.json

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

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"auto-test": "nodemon --exec npm test"
2525
},
2626
"dependencies": {
27+
"aggregate-error": "^3.1.0",
2728
"probot": "^10.19.0"
2829
},
2930
"devDependencies": {

0 commit comments

Comments
 (0)