Correctly detect failed pipeline (#192)

Author: pepakriz

server/src/MergeRequestAcceptor.ts

@@ -299,16 +299,15 @@ export const acceptMergeRequest = async (
 		};
 	}
 
+	// the latest pipeline is incomplete / has failed
 	if (
-		[DetailedMergeStatus.CiMustPass, DetailedMergeStatus.CiStillRunning].includes(
-			mergeRequestInfo.detailed_merge_status,
-		)
+		mergeRequestInfo.head_pipeline !== null &&
+		incompletePipelineStatuses.includes(mergeRequestInfo.head_pipeline.status)
 	) {
 		return {
-			kind: AcceptMergeRequestResultKind.PipelineInProgress,
+			kind: AcceptMergeRequestResultKind.CanNotBeMerged,
 			mergeRequestInfo,
 			user,
-			pipeline: mergeRequestInfo.head_pipeline,
 		};
 	}
 
@@ -324,6 +323,19 @@ export const acceptMergeRequest = async (
 		};
 	}
 
+	if (
+		[DetailedMergeStatus.CiMustPass, DetailedMergeStatus.CiStillRunning].includes(
+			mergeRequestInfo.detailed_merge_status,
+		)
+	) {
+		return {
+			kind: AcceptMergeRequestResultKind.PipelineInProgress,
+			mergeRequestInfo,
+			user,
+			pipeline: mergeRequestInfo.head_pipeline,
+		};
+	}
+
 	const useSquash = mergeRequestInfo.labels.includes(config.SKIP_SQUASHING_LABEL)
 		? false
 		: config.SQUASH_MERGE_REQUEST;
@@ -506,6 +518,14 @@ export const runAcceptingMergeRequest = async (
 	}
 
 	const currentPipeline = mergeRequestInfo.head_pipeline;
+	if (currentPipeline !== null && currentPipeline.status === PipelineStatus.Failed) {
+		return {
+			kind: AcceptMergeRequestResultKind.FailedPipeline,
+			mergeRequestInfo,
+			user,
+			pipeline: currentPipeline,
+		};
+	}
 
 	if (
 		currentPipeline !== null &&
@@ -618,15 +638,6 @@ export const runAcceptingMergeRequest = async (
 		return;
 	}
 
-	if (currentPipeline.status === PipelineStatus.Failed) {
-		return {
-			kind: AcceptMergeRequestResultKind.FailedPipeline,
-			mergeRequestInfo,
-			user,
-			pipeline: currentPipeline,
-		};
-	}
-
 	if (
 		currentPipeline.status !== PipelineStatus.Success &&
 		currentPipeline.status !== PipelineStatus.Skipped &&