From 2c37c48ba81b9d7d31e8be490dfc69638e067baa Mon Sep 17 00:00:00 2001
From: IlyaasK <86218345+IlyaasK@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:07:20 +0000
Subject: [PATCH 1/3] Recover Docker before macOS tests

---
 .github/workflows/test.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48993bea..2a1b111e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -188,6 +188,27 @@ jobs:
         with:
           go-version: '1.25.4'
           cache: false
+      - name: Ensure Docker is running
+        run: |
+          if docker info >/dev/null 2>&1; then
+            exit 0
+          fi
+
+          colima stop --force || true
+          if ! colima start; then
+            colima delete --force
+            colima start
+          fi
+
+          for attempt in {1..30}; do
+            if docker info >/dev/null 2>&1; then
+              exit 0
+            fi
+            echo "waiting for Docker daemon (${attempt}/30)"
+            sleep 2
+          done
+
+          docker info
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:

From e36e29d4ede1ee62964f62fda6cd9d9f6ab0b85d Mon Sep 17 00:00:00 2001
From: IlyaasK <86218345+IlyaasK@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:26:12 +0000
Subject: [PATCH 2/3] Start Colima before recovery

---
 .github/workflows/test.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2a1b111e..75b3c8a2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -194,10 +194,16 @@ jobs:
             exit 0
           fi
 
-          colima stop --force || true
+          if colima status >/dev/null 2>&1; then
+            colima stop --force
+          fi
+
           if ! colima start; then
-            colima delete --force
-            colima start
+            colima stop --force || true
+            if ! colima start; then
+              colima delete --force
+              colima start
+            fi
           fi
 
           for attempt in {1..30}; do

From ce45c8a3bcdb3d76cc3040d913e0a645333ee91f Mon Sep 17 00:00:00 2001
From: IlyaasK <86218345+IlyaasK@users.noreply.github.com>
Date: Wed, 15 Jul 2026 19:30:05 +0000
Subject: [PATCH 3/3] Continue Colima recovery after stop errors

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75b3c8a2..005a4118 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -195,7 +195,7 @@ jobs:
           fi
 
           if colima status >/dev/null 2>&1; then
-            colima stop --force
+            colima stop --force || true
           fi
 
           if ! colima start; then