From d5b9dd9f7cea4b86f15021b4678cd89ed138a3ca Mon Sep 17 00:00:00 2001
From: Dylan Staley <88163+dstaley@users.noreply.github.com>
Date: Mon, 28 Sep 2026 14:03:50 -0500
Subject: [PATCH 1/4] chore(ui): Increase retries and timeout in CI

---
 .changeset/tame-bats-invent.md | 2 ++
 packages/ui/vitest.config.mts  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/tame-bats-invent.md

diff --git a/.changeset/tame-bats-invent.md b/.changeset/tame-bats-invent.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/tame-bats-invent.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/ui/vitest.config.mts b/packages/ui/vitest.config.mts
index 956270bd379..8491e803d5e 100644
--- a/packages/ui/vitest.config.mts
+++ b/packages/ui/vitest.config.mts
@@ -47,7 +47,8 @@ export default defineConfig({
     include: ['**/*.test.?(c|m)[jt]s?(x)', '**/*.spec.?(c|m)[jt]s?(x)'],
     exclude: ['node_modules/**', 'dist/**'],
     setupFiles: ['../clerk-js/vitest.setup.mts', './vitest.setup.mts'],
-    testTimeout: 5000,
+    retry: process.env.CI ? 3 : 0,
+    testTimeout: process.env.CI ? 10_000 : 5000,
   },
   resolve: {
     alias: [

From 9efd6fa0d1c40201dab80af6190a4ce7800772a1 Mon Sep 17 00:00:00 2001
From: Dylan Staley <88163+dstaley@users.noreply.github.com>
Date: Mon, 28 Sep 2026 14:21:34 -0500
Subject: [PATCH 2/4] chore(repo): hardcode unit tests to concurrency 1

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 615da0d802f..af3e133428a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -296,6 +296,7 @@ jobs:
 
       - name: Run tests in packages
         run: |
+          TURBO_ARGS=$(sed -E 's/--concurrency=[0-9]+/--concurrency=1/' <<< "$TURBO_ARGS")
           if [ "${{ matrix.test-filter }}" = "**" ]; then
             echo "Running full test suite on Node ${{ matrix.node-version }}"
             pnpm turbo test $TURBO_ARGS

From f19011648c075f3f936300a16d3ec44bc80a255e Mon Sep 17 00:00:00 2001
From: Dylan Staley <88163+dstaley@users.noreply.github.com>
Date: Mon, 28 Sep 2026 14:34:22 -0500
Subject: [PATCH 3/4] temp: force unit tests

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af3e133428a..1f26ae32b46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,7 +299,7 @@ jobs:
           TURBO_ARGS=$(sed -E 's/--concurrency=[0-9]+/--concurrency=1/' <<< "$TURBO_ARGS")
           if [ "${{ matrix.test-filter }}" = "**" ]; then
             echo "Running full test suite on Node ${{ matrix.node-version }}"
-            pnpm turbo test $TURBO_ARGS
+            pnpm turbo test $TURBO_ARGS --force
           else
             echo "Running tests: ${{ matrix.filter-label }}"
             pnpm turbo test $TURBO_ARGS ${{ matrix.test-filter }}

From e7271a5887074f6e8f08322fbb550b726c568e76 Mon Sep 17 00:00:00 2001
From: Dylan Staley <88163+dstaley@users.noreply.github.com>
Date: Mon, 28 Sep 2026 15:02:45 -0500
Subject: [PATCH 4/4] chore(repo): rm force

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f26ae32b46..af3e133428a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,7 +299,7 @@ jobs:
           TURBO_ARGS=$(sed -E 's/--concurrency=[0-9]+/--concurrency=1/' <<< "$TURBO_ARGS")
           if [ "${{ matrix.test-filter }}" = "**" ]; then
             echo "Running full test suite on Node ${{ matrix.node-version }}"
-            pnpm turbo test $TURBO_ARGS --force
+            pnpm turbo test $TURBO_ARGS
           else
             echo "Running tests: ${{ matrix.filter-label }}"
             pnpm turbo test $TURBO_ARGS ${{ matrix.test-filter }}