From 3cbcd43f9abdd7c376f582bcbdfebdc0ab800feb Mon Sep 17 00:00:00 2001
From: Ashcon Partovi <ashcon@partovi.net>
Date: Thu, 19 Dec 2024 11:18:13 -0800
Subject: [PATCH] ci: Enable merge queue, disable soft failing tests

---
 .buildkite/ci.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/ci.mjs b/.buildkite/ci.mjs
index 9f39a72a3d..3fb1e643f3 100755
--- a/.buildkite/ci.mjs
+++ b/.buildkite/ci.mjs
@@ -543,9 +543,8 @@ function getTestBunStep(platform, options, testOptions = {}) {
     label: `${getPlatformLabel(platform)} - test-bun`,
     depends_on: depends,
     agents: getTestAgent(platform, options),
-    cancel_on_build_failing: isMergeQueue(),
     retry: getRetry(),
-    soft_fail: isMainBranch() ? true : [{ exit_status: 2 }],
+    cancel_on_build_failing: isMergeQueue(),
     parallelism: unifiedTests ? undefined : os === "darwin" ? 2 : 10,
     command:
       os === "windows"
@@ -590,6 +589,7 @@ function getBuildImageStep(platform, options) {
       DEBUG: "1",
     },
     retry: getRetry(),
+    cancel_on_build_failing: isMergeQueue(),
     command: command.filter(Boolean).join(" "),
     timeout_in_minutes: 3 * 60,
   };