[Fix] display review status first as output now shows check status

ljharb · Apr 20, 2022 · f4a5f3b · f4a5f3b
1 parent 89a12f4
commit f4a5f3b
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/utils/evaluatePullRequest.js b/utils/evaluatePullRequest.js
@@ -25,6 +25,15 @@ module.exports = function evaluatePullRequest(response, requiredChecks) {
 	if (!doesPRHaveConflicts(response)) {
 		return pullRequestStatus.CONFLICT;
 	}
+
+	if (reviewDecision === 'CHANGES_REQUESTED') {
+		return pullRequestStatus.REVIEW_DISAPPROVED;
+	}
+
+	if (reviewDecision === 'REVIEW_REQUIRED') {
+		return viewerCanMergeAsAdmin ? pullRequestStatus.BYPASSABLE : pullRequestStatus.REVIEW_REQUIRED;
+	}
+
 	const { failure, pending } = evaluateChecks(response, requiredChecks);
 
 	if (failure.some((f) => f.isRequired)) {
@@ -35,11 +44,5 @@ module.exports = function evaluatePullRequest(response, requiredChecks) {
 		return pullRequestStatus.STATUS_PENDING;
 	}
 
-	if (reviewDecision === 'CHANGES_REQUESTED') {
-		return pullRequestStatus.REVIEW_DISAPPROVED;
-	} else if (reviewDecision === 'REVIEW_REQUIRED') {
-		return viewerCanMergeAsAdmin ? pullRequestStatus.BYPASSABLE : pullRequestStatus.REVIEW_REQUIRED;
-	}
-
 	return pullRequestStatus.MERGEABLE;
 };