WIP

Author: pwltr

.github/workflows/e2e-self-hosted.yml

@@ -50,36 +50,32 @@ jobs:
           echo "SIMULATOR_NAME=$SIMULATOR_NAME" >> $GITHUB_ENV
           
           # List available simulators
+          echo "=== Available iOS Simulators ==="
           xcrun simctl list devices available
           
-          # Kill any existing simulators to start fresh
-          xcrun simctl shutdown all || true
-          sleep 5
-          
-          # Boot the specified simulator
-          echo "Booting $SIMULATOR_NAME..."
-          xcrun simctl boot "$SIMULATOR_NAME" || true
-          
-          # Wait for simulator to boot
-          echo "Waiting for simulator to boot..."
-          for i in {1..30}; do
-            if xcrun simctl list devices | grep "$SIMULATOR_NAME" | grep -q "Booted"; then
-              echo "$SIMULATOR_NAME is booted!"
-              break
-            fi
-            echo "Waiting for $SIMULATOR_NAME boot... ($i/30)"
-            sleep 5
-          done
+          # Check if iPhone 17 simulator is already booted
+          if xcrun simctl list devices | grep "iPhone 17" | grep -q "Booted"; then
+            echo "iPhone 17 simulator is already booted!"
+          else
+            # Boot the iPhone 17 simulator
+            echo "Booting $SIMULATOR_NAME..."
+            xcrun simctl boot "$SIMULATOR_NAME" || true
+            
+            # Wait for simulator to boot
+            echo "Waiting for simulator to boot..."
+            for i in {1..30}; do
+              if xcrun simctl list devices | grep "$SIMULATOR_NAME" | grep -q "Booted"; then
+                echo "$SIMULATOR_NAME is booted!"
+                break
+              fi
+              echo "Waiting for $SIMULATOR_NAME boot... ($i/30)"
+              sleep 5
+            done
+          fi
           
           # Additional wait for simulator to be fully ready
           sleep 15
           
-          # Install the app
-          #xcrun simctl install "$SIMULATOR_NAME" e2e-app/bitkit.app
-          
-          # Verify app installation
-          xcrun simctl listapps "$SIMULATOR_NAME" | grep -i bitkit || echo "App not found in simulator"
-          
           # Check simulator status
           xcrun simctl list devices | grep "$SIMULATOR_NAME"
           
@@ -108,13 +104,31 @@ jobs:
           E2E: true
         run: |
           echo "=== Building iOS app ==="
-          xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
-            -scheme Bitkit \
-            -configuration Debug \
-            -destination 'platform=iOS Simulator,name=iPhone 17,OS=latest' \
-            -derivedDataPath DerivedData \
-            -allowProvisioningUpdates \
-            build
+          
+          # Get the UDID of the booted simulator
+          SIMULATOR_UDID=$(xcrun simctl list devices | grep "$SIMULATOR_NAME" | grep "Booted" | awk '{print $NF}' | tr -d '()')
+          echo "Using simulator UDID: $SIMULATOR_UDID"
+          
+          if [ -n "$SIMULATOR_UDID" ]; then
+            # Build with specific simulator UDID
+            xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
+              -scheme Bitkit \
+              -configuration Debug \
+              -destination "platform=iOS Simulator,id=$SIMULATOR_UDID" \
+              -derivedDataPath DerivedData \
+              -allowProvisioningUpdates \
+              build
+          else
+            # Fallback to generic iOS Simulator destination
+            echo "No booted simulator found, trying generic destination..."
+            xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
+              -scheme Bitkit \
+              -configuration Debug \
+              -destination 'platform=iOS Simulator,name=iPhone 17' \
+              -derivedDataPath DerivedData \
+              -allowProvisioningUpdates \
+              build
+          fi
 
       - name: Prepare app for E2E tests
         run: |