WIP

Author: pwltr

.github/workflows/debug-docker.yml

@@ -46,22 +46,35 @@ jobs:
               }
             }
 
-      - name: Setup Docker Colima (Fallback)
-        uses: douglascamata/setup-docker-macos-action@v1-alpha
-        id: docker1
-        continue-on-error: true
+      # - name: Setup Docker Colima (Fallback)
+      #   uses: douglascamata/setup-docker-macos-action@v1-alpha
+      #   id: docker-colima
+      #   continue-on-error: true
 
       - name: Check Docker setup results
         run: |
           echo "=== Docker Setup Results ==="
           echo "Official Docker action result: ${{ steps.docker-official.outcome }}"
-          echo "Colima action result: ${{ steps.docker1.outcome }}"
+          # echo "Colima action result: ${{ steps.docker-colima.outcome }}"
           
       - name: Wait for Docker to start
         run: |
           echo "=== Waiting for Docker to start ==="
-          timeout 180 bash -c 'until docker info >/dev/null 2>&1; do echo "Waiting for Docker... ($(date))"; sleep 10; done'
-          echo "Docker is ready!"
+          # Use a for loop instead of timeout (macOS doesn't have timeout command)
+          for i in {1..18}; do
+            if docker info >/dev/null 2>&1; then
+              echo "Docker is ready!"
+              break
+            fi
+            echo "Waiting for Docker... ($(date)) (attempt $i/18)"
+            sleep 10
+          done
+          
+          # Final check
+          if ! docker info >/dev/null 2>&1; then
+            echo "Docker failed to start after 3 minutes"
+            exit 1
+          fi
 
       - name: Test Docker functionality
         run: |

.github/workflows/e2e-tests-hybrid.yml

@@ -73,17 +73,20 @@ jobs:
           
           echo "Regtest infrastructure ready locally"
 
+      - name: Setup cloudflared
+        uses: AnimMouse/setup-cloudflared@v2
+
       - name: Expose Electrum with Cloudflare Tunnel
         id: tunnel-electrum
-        uses: cloudflare/cloudflared-action@v2
+        uses: AnimMouse/setup-cloudflared/tunnel@v2
         with:
-          port: 60001
+          url: http://localhost:60001
 
       - name: Expose LND with Cloudflare Tunnel
         id: tunnel-lnd
-        uses: cloudflare/cloudflared-action@v2
+        uses: AnimMouse/setup-cloudflared/tunnel@v2
         with:
-          port: 9735
+          url: http://localhost:9735
 
       - name: Keep regtest running
         run: |
@@ -130,6 +133,10 @@ jobs:
           echo "Tunnel URLs:"
           echo "Electrum: ${{ steps.tunnel-electrum.outputs.url }}"
           echo "LND: ${{ steps.tunnel-lnd.outputs.url }}"
+          
+          # Keep the job running to maintain tunnels
+          echo "Keeping job alive to maintain tunnels..."
+          sleep 3600  # Keep alive for 1 hour
 
   # Job 2: Build iOS app and run E2E tests on macOS
   e2e-tests:
@@ -500,3 +507,7 @@ jobs:
         with:
           name: e2e-artifacts_${{ matrix.shard.name }}_${{ github.run_number }}
           path: bitkit-e2e-tests/artifacts/
+
+      - name: Shutdown Cloudflare Tunnels
+        if: always()
+        uses: AnimMouse/setup-cloudflared/shutdown@v2