Print log, move server start android

Author: j-piasecki

.github/workflows/android-e2e.yml

@@ -58,34 +58,6 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
-      # Start the tool-server out-of-band and hand `flow run` its URL, so it
-      # reuses this server instead of spawning one in-process and hitting the
-      # hard ~15s startup timeout on cold CI runners. The `/tools` endpoint is
-      # ready without a device attached, so we can start it before the emulator
-      # boots; the background process persists across steps and the emulator
-      # step below inherits ARGENT_TOOLS_URL via $GITHUB_ENV.
-      #
-      # `server start --detach` can fail to return on CI (its parent keeps the
-      # child's stdout pipe referenced), so background it with output redirected
-      # to a file — never the runner's pipe — and poll the port for readiness
-      # ourselves.
-      - name: Start Argent tool-server
-        run: |
-          nohup argent server start --detach --no-auth --port 3001 \
-            > argent-server.log 2>&1 &
-          echo "Waiting for Argent tool-server on :3001..."
-          for i in $(seq 1 60); do
-            if curl -fsS http://127.0.0.1:3001/tools >/dev/null 2>&1; then
-              echo "tool-server is ready"
-              echo "ARGENT_TOOLS_URL=http://127.0.0.1:3001" >> "$GITHUB_ENV"
-              exit 0
-            fi
-            sleep 2
-          done
-          echo "Argent tool-server failed to become ready in time" >&2
-          cat argent-server.log >&2
-          exit 1
-
       - name: Set up emulator and run tap E2E test
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -96,8 +68,26 @@ jobs:
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           # android-emulator-runner runs each line of `script` as a separate
-          # `sh -c`, so variables don't persist between lines and multi-line
-          # constructs (if/fi) break. Keep every command self-contained on one line.
+          # `sh -c`, so exported vars don't persist between lines and multi-line
+          # constructs (if/fi) break. Keep every command self-contained on one
+          # line and pass ARGENT_TOOLS_URL inline.
+          #
+          # Start the tool-server HERE (not in an earlier step) so the
+          # simulator-server it spawns inherits this action's HOME, adb, and SDK
+          # env. That backend discovers the emulator's gRPC endpoint from
+          # $HOME/.android/avd/running/*.ini and shells out to adb, so it must
+          # share the emulator's exact environment. Backgrounded with our own
+          # readiness poll to dodge flow-run's hard ~15s in-process startup
+          # timeout; the process persists after its launching `sh -c` exits.
           script: |
-            adb install -r "$(find apps/expo-example/android/app/build/outputs/apk/release -name '*.apk' | head -1)"
-            argent flow run simple-tap-test --device "$(adb devices | awk 'NR>1 && $2=="device"{print $1; exit}')"
+            nohup argent server start --detach --no-auth --port 3001 > "$GITHUB_WORKSPACE/argent-server.log" 2>&1 &
+            for i in $(seq 1 60); do curl -fsS http://127.0.0.1:3001/tools >/dev/null 2>&1 && break; sleep 2; done
+            adb install -r "$(find "$GITHUB_WORKSPACE/apps/expo-example/android/app/build/outputs/apk/release" -name '*.apk' | head -1)"
+            ARGENT_TOOLS_URL=http://127.0.0.1:3001 argent flow run simple-tap-test --device "$(adb devices | awk 'NR>1 && $2=="device"{print $1; exit}')"
+
+      # The simulator-server's stderr (prefixed `[sim <udid>]`) is written to the
+      # tool-server log — this is where a "simulator-server exited before ready"
+      # crash reason shows up. Always print it so failures are diagnosable.
+      - name: Print Argent tool-server log
+        if: always()
+        run: cat argent-server.log 2>/dev/null || echo "no argent-server.log"

.github/workflows/ios-e2e.yml

@@ -113,3 +113,10 @@ jobs:
 
       - name: Run tap E2E test
         run: argent flow run simple-tap-test --device $SIMULATOR_UDID
+
+      # The simulator-server's stderr (prefixed `[sim <udid>]`) is written to the
+      # tool-server log — this is where a "simulator-server exited before ready"
+      # crash reason shows up. Always print it so failures are diagnosable.
+      - name: Print Argent tool-server log
+        if: always()
+        run: cat argent-server.log 2>/dev/null || echo "no argent-server.log"