WIP

Author: pwltr

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

@@ -171,40 +171,67 @@ jobs:
           xcrun simctl shutdown all || true
           sleep 5
           
-          # Boot iPhone 16 with specific device ID to avoid ambiguity
-          xcrun simctl boot "iPhone 16" || true
+          # Try iPhone 15 first (often more reliable in CI)
+          echo "Trying iPhone 15 first..."
+          xcrun simctl boot "iPhone 15" || true
           
-          # Wait longer for simulator to boot and add retry logic
+          # Wait for simulator to boot
           echo "Waiting for simulator to boot..."
           for i in {1..30}; do
-            if xcrun simctl list devices | grep "iPhone 16" | grep -q "Booted"; then
-              echo "Simulator is booted!"
+            if xcrun simctl list devices | grep "iPhone 15" | grep -q "Booted"; then
+              echo "iPhone 15 is booted!"
+              SIMULATOR_NAME="iPhone 15"
               break
             fi
-            echo "Waiting for simulator boot... ($i/30)"
+            echo "Waiting for iPhone 15 boot... ($i/30)"
             sleep 5
           done
           
+          # If iPhone 15 failed, try iPhone 16
+          if [ -z "$SIMULATOR_NAME" ]; then
+            echo "iPhone 15 failed, trying iPhone 16..."
+            xcrun simctl shutdown "iPhone 15" || true
+            xcrun simctl boot "iPhone 16" || true
+            
+            for i in {1..30}; do
+              if xcrun simctl list devices | grep "iPhone 16" | grep -q "Booted"; then
+                echo "iPhone 16 is booted!"
+                SIMULATOR_NAME="iPhone 16"
+                break
+              fi
+              echo "Waiting for iPhone 16 boot... ($i/30)"
+              sleep 5
+            done
+          fi
+          
+          if [ -z "$SIMULATOR_NAME" ]; then
+            echo "Both simulators failed to boot"
+            exit 1
+          fi
+          
           # Additional wait for simulator to be fully ready
           sleep 15
           
           # Install the app
-          xcrun simctl install "iPhone 16" e2e-app/bitkit.app
+          xcrun simctl install "$SIMULATOR_NAME" e2e-app/bitkit.app
           
           # Verify app installation
-          xcrun simctl listapps "iPhone 16" | grep -i bitkit || echo "App not found in simulator"
+          xcrun simctl listapps "$SIMULATOR_NAME" | grep -i bitkit || echo "App not found in simulator"
           
           # Check simulator status
-          xcrun simctl list devices | grep "iPhone 16"
+          xcrun simctl list devices | grep "$SIMULATOR_NAME"
           
           # Launch simulator app to ensure it's visible
           open -a Simulator
           sleep 5
+          
+          # Export simulator name for later use
+          echo "SIMULATOR_NAME=$SIMULATOR_NAME" >> $GITHUB_ENV
 
       - name: Start Appium Server
         run: |
           # Start Appium server in background with more verbose logging
-          appium --port 4723 --log-level debug --relaxed-security &
+          appium --port 4723 --log-level debug --relaxed-security --session-override &
           APPIUM_PID=$!
           echo "APPIUM_PID=$APPIUM_PID" >> $GITHUB_ENV
           
@@ -228,6 +255,14 @@ jobs:
           # Test Appium with a simple request
           echo "Testing Appium connection..."
           curl -s http://localhost:4723/status | head -20
+          
+          # Check if simulator is accessible to Appium
+          echo "Checking simulator accessibility..."
+          xcrun simctl list devices | grep "iPhone 16"
+          
+          # Try to get simulator logs to debug
+          echo "Recent simulator logs:"
+          xcrun simctl spawn "iPhone 16" log show --last 1m --predicate 'process == "SpringBoard"' | head -10
 
       - name: Run E2E Tests (${{ matrix.shard.name }})
         run: |
@@ -239,7 +274,7 @@ jobs:
           LOGFILE="$LOGDIR/simulator.log"
           
           # Start simulator logging
-          xcrun simctl spawn "iPhone 16" log stream --predicate 'process == "Bitkit"' --style compact > "$LOGFILE" &
+          xcrun simctl spawn "$SIMULATOR_NAME" log stream --predicate 'process == "Bitkit"' --style compact > "$LOGFILE" &
           LOG_PID=$!
           
           # Cleanup function
@@ -259,6 +294,15 @@ jobs:
           sed -i '' 's/connectionRetryTimeout: [0-9]*/connectionRetryTimeout: 300000/' wdio.conf.ts
           sed -i '' 's/waitforTimeout: [0-9]*/waitforTimeout: 60000/' wdio.conf.ts
           
+          # Update device name to match the booted simulator
+          echo "Updating wdio.conf.ts to use simulator: $SIMULATOR_NAME"
+          sed -i '' "s/'appium:deviceName': '[^']*'/'appium:deviceName': '$SIMULATOR_NAME'/" wdio.conf.ts
+          sed -i '' "s/\"appium:deviceName\": \"[^\"]*\"/\"appium:deviceName\": \"$SIMULATOR_NAME\"/" wdio.conf.ts
+          
+          # Verify the change was made
+          echo "Updated wdio.conf.ts device name:"
+          grep -n "deviceName" wdio.conf.ts
+          
           # Add Appium capabilities to help with simulator boot issues
           sed -i '' 's/"appium:autoAcceptAlerts": true/"appium:autoAcceptAlerts": true,\n          "appium:newCommandTimeout": 300,\n          "appium:commandTimeouts": {"implicit": 30000},\n          "appium:launchTimeout": 300000,\n          "appium:deviceReadyTimeout": 300000,\n          "appium:autoLaunch": false/' wdio.conf.ts