Adjust e2e workflow

Author: piotr-iohk

.github/workflows/e2e-tests.yml

@@ -4,13 +4,10 @@ on:
   workflow_dispatch:
     inputs:
       e2e_branch:
-        description: "Branch of synonymdev/bitkit-e2e-tests to use"
+        description: "Branch of synonymdev/bitkit-e2e-tests to use (main | default-feature-branch | custom branch name)"
         required: false
-        default: "ios-preparation"
-  # push:
-  #   branches: [master]
-  # pull_request:
-  #   branches: [master]
+        default: "default-feature-branch"
+  pull_request:
 
 env:
   TERM: xterm-256color
@@ -22,6 +19,7 @@ concurrency:
 
 jobs:
   build:
+    if: github.event.pull_request.draft == false
     runs-on: [self-hosted, macOS]
 
     steps:
@@ -36,7 +34,7 @@ jobs:
           echo ""
           echo "Xcode Version:"
           xcodebuild -version
-
+          
       - name: Setup iOS Simulator
         run: |
           # Set simulator name
@@ -113,9 +111,17 @@ jobs:
           name: bitkit-e2e-ios_${{ github.run_number }}
           path: e2e-app/
 
+  e2e-branch:
+    if: github.event.pull_request.draft == false
+    uses: synonymdev/bitkit-e2e-tests/.github/workflows/determine-e2e-branch.yml@main
+    with:
+      app_branch: ${{ github.head_ref || github.ref_name }}
+      e2e_branch_input: ${{ github.event.inputs.e2e_branch || 'default-feature-branch' }}
+
   e2e-tests:
+    if: github.event.pull_request.draft == false
     runs-on: [self-hosted, macOS]
-    needs: build
+    needs: [build, e2e-branch]
 
     strategy:
       fail-fast: false
@@ -200,40 +206,9 @@ jobs:
           done
           echo "Electrum server is ready!"
 
-      - name: Setup iOS Simulator
-        run: |
-          # Boot iOS Simulator
-          xcrun simctl boot "iPhone 17" || true
-          xcrun simctl bootstatus "iPhone 17" -b
-          
-          # Install the app
-          xcrun simctl install "iPhone 17" bitkit-e2e-tests/aut/bitkit.app
-
       - name: Run E2E Tests (${{ matrix.shard.name }})
-        run: |
-          cd bitkit-e2e-tests
-          
-          # Setup logging
-          LOGDIR="./artifacts"
-          mkdir -p "$LOGDIR"
-          LOGFILE="$LOGDIR/simulator.log"
-          
-          # Start simulator logging
-          xcrun simctl spawn "iPhone 17" log stream --predicate 'process == "Bitkit"' --style compact > "$LOGFILE" &
-          LOG_PID=$!
-          
-          # Setup port forwarding for regtest and LND
-          xcrun simctl spawn "iPhone 17" launchctl load -w /System/Library/LaunchDaemons/com.apple.usbmuxd.plist || true
-          
-          # Cleanup function
-          cleanup() {
-            kill "$LOG_PID" 2>/dev/null || true
-            wait "$LOG_PID" 2>/dev/null || true
-          }
-          trap cleanup EXIT INT TERM
-          
-          # Pass everything through to WDIO/Mocha
-          npm run e2e:ios -- "$@"
+        working-directory: bitkit-e2e-tests
+        run: ./ci_run_ios.sh --mochaOpts.grep "${{ matrix.shard.grep }}"
         env:
           RECORD_VIDEO: true