force bundling

JohnathanWhite · JohnathanWhite · commit 2120244d7a2b · 2026-04-14T23:46:17.000-04:00
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -1,7 +1,6 @@
 name: E2E Android
 
 on:
-  pull_request:
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -9,10 +9,27 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  changes:
+    name: Detect changes
+    runs-on: ubuntu-latest
+    outputs:
+      native: ${{ steps.filter.outputs.native }}
+    steps:
+      - uses: actions/checkout@v5
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            native:
+              - 'ios/**'
+              - 'yarn.lock'
+
   build-ios:
     name: Build iOS App
-    runs-on: macos-latest
-    timeout-minutes: 45
+    needs: changes
+    if: needs.changes.outputs.native == 'true'
+    runs-on: macos-latest-xlarge
+    timeout-minutes: 75
 
     steps:
       - name: Checkout
@@ -22,9 +39,16 @@ jobs:
         uses: actions/setup-node@v5
         with:
           node-version-file: '.node-version'
-          cache: 'yarn'
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('yarn.lock') }}
 
       - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile
 
       - name: Create env file
@@ -54,59 +78,106 @@ jobs:
         with:
           path: ios/Pods
           key: pods-${{ hashFiles('ios/Podfile.lock') }}
-          restore-keys: pods-
 
       - name: Install CocoaPods
-        run: |
-          cd ios
-          bundle exec pod install
+        run: cd ios && bundle exec pod install
+
+      - name: Select Xcode
+        run: sudo xcode-select -switch /Applications/Xcode_16.2.app
+
+      - name: Get Xcode version
+        run: echo "XCODE_VERSION=$(xcodebuild -version | head -1 | tr ' ' '-')" >> $GITHUB_ENV
 
       - name: Cache Xcode build products
         uses: actions/cache@v4
         with:
           path: ios/build/Build/Products
-          key: xcode-products-${{ runner.os }}-${{ hashFiles('ios/Podfile.lock', 'yarn.lock') }}
-          restore-keys: xcode-products-${{ runner.os }}-
+          key: xcode-products-${{ runner.os }}-${{ env.XCODE_VERSION }}-${{ hashFiles('ios/Podfile.lock', 'yarn.lock') }}
 
-      - name: Select Xcode
-        run: sudo xcode-select -switch /Applications/Xcode.app
+      - name: Boot simulator for build
+        run: |
+          UDID=$(xcrun simctl list devices available | grep -E "iPhone [0-9]" | head -1 | grep -E -o '\(([0-9A-F-]+)\)' | tr -d '()')
+          echo "Booting simulator: $UDID"
+          xcrun simctl boot "$UDID" || true
+          xcrun simctl bootstatus "$UDID" -b
+          echo "BUILD_SIMULATOR_UDID=$UDID" >> $GITHUB_ENV
 
       - name: Build iOS app for simulator
         env:
           SENTRY_DISABLE_AUTO_UPLOAD: true
+          NODE_OPTIONS: "--max_old_space_size=8192"
         run: |
           xcodebuild \
             -workspace ios/BitPayApp.xcworkspace \
             -scheme BitPayApp \
             -configuration Debug \
             -sdk iphonesimulator \
             -derivedDataPath ios/build \
-            -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
+            -destination "id=$BUILD_SIMULATOR_UDID" \
             SWIFT_ACTIVE_COMPILATION_CONDITIONS="DEBUG MAESTRO" \
+            FORCE_BUNDLING=YES \
+            ONLY_ACTIVE_ARCH=YES \
+            CLANG_MODULES_VALIDATE_SYSTEM_HEADERS=NO \
             build
 
-      - name: Upload app artifact
-        uses: actions/upload-artifact@v5
+      - name: Save .app to cache
+        uses: actions/cache/save@v4
         with:
-          name: ios-app-simulator
           path: ios/build/Build/Products/Debug-iphonesimulator/BitPayApp.app
-          retention-days: 1
+          key: ios-app-${{ hashFiles('ios/Podfile.lock', 'yarn.lock') }}
 
   test-ios:
     name: E2E iOS Smoke
-    needs: build-ios
-    runs-on: macos-latest
+    needs: [changes, build-ios]
+    if: always() && (needs.build-ios.result == 'success' || needs.build-ios.result == 'skipped')
+    runs-on: macos-latest-xlarge
     timeout-minutes: 30
 
     steps:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Download app artifact
-        uses: actions/download-artifact@v4
+      - name: Setup Node
+        uses: actions/setup-node@v5
+        with:
+          node-version-file: '.node-version'
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-${{ hashFiles('yarn.lock') }}
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile
+
+      - name: Create env file
+        env:
+          ENV_FILE: ${{ secrets.ENV_DEVELOPMENT }}
+        run: |
+          echo "$ENV_FILE" > .env.development
+          echo "IS_MAESTRO=true" >> .env.development
+
+      - name: Restore .app from cache
+        uses: actions/cache/restore@v4
         with:
-          name: ios-app-simulator
-          path: BitPayApp.app
+          path: ios/build/Build/Products/Debug-iphonesimulator/BitPayApp.app
+          key: ios-app-${{ hashFiles('ios/Podfile.lock', 'yarn.lock') }}
+          fail-on-cache-miss: true
+
+      - name: Bundle JS and inject into app
+        env:
+          NODE_OPTIONS: "--max_old_space_size=8192"
+        run: |
+          npx react-native bundle \
+            --platform ios \
+            --dev false \
+            --entry-file index.js \
+            --bundle-output main.jsbundle \
+            --assets-dest ios/build/Build/Products/Debug-iphonesimulator/BitPayApp.app
+          cp main.jsbundle ios/build/Build/Products/Debug-iphonesimulator/BitPayApp.app/main.jsbundle
 
       - name: Cache Maestro
         uses: actions/cache@v4
@@ -122,14 +193,14 @@ jobs:
 
       - name: Boot simulator
         run: |
-          UDID=$(xcrun simctl list devices available | grep "iPhone 16" | head -1 | grep -E -o '\(([0-9A-F-]+)\)' | tr -d '()')
+          UDID=$(xcrun simctl list devices available | grep -E "iPhone [0-9]" | head -1 | grep -E -o '\(([0-9A-F-]+)\)' | tr -d '()')
+          echo "Booting simulator: $UDID"
           xcrun simctl boot "$UDID"
-          # Wait until simulator is fully booted before proceeding
           xcrun simctl bootstatus "$UDID" -b
           echo "SIMULATOR_UDID=$UDID" >> $GITHUB_ENV
 
       - name: Install app on simulator
-        run: xcrun simctl install "$SIMULATOR_UDID" BitPayApp.app
+        run: xcrun simctl install "$SIMULATOR_UDID" ios/build/Build/Products/Debug-iphonesimulator/BitPayApp.app
 
       - name: Run Maestro smoke tests
         run: maestro test .maestro/flows/ --format junit --output maestro-results.xml
diff --git a/.maestro/flows/onboarding_to_home.yaml b/.maestro/flows/onboarding_to_home.yaml
@@ -13,32 +13,41 @@ appId: com.bitpay.wallet
     id: "continue-without-an-account-button"
 
 # Notifications screen
-- assertVisible:
-    id: "set-notifications-view"
+- extendedWaitUntil:
+    visible:
+      id: "set-notifications-view"
+    timeout: 15000
 - tapOn:
     id: "skip-button"
 
 # Protect your wallet (security) screen
-- assertVisible:
-    id: "security-view"
+- extendedWaitUntil:
+    visible:
+      id: "security-view"
+    timeout: 15000
 - tapOn:
     id: "skip-button"
 
 # Create key screen
-- assertVisible:
-    id: "create-key-view"
+- extendedWaitUntil:
+    visible:
+      id: "create-key-view"
+    timeout: 15000
 - tapOn:
     id: "i-already-have-a-key-button"
 
 # Import screen - enter seed phrase
-- assertVisible:
-    id: "import-view"
+- extendedWaitUntil:
+    visible:
+      id: "import-view"
+    timeout: 15000
 - tapOn:
     id: "import-text-input"
 - inputText: "gown pizza sell law yard laundry gown action enemy speed embark awkward"
 
-# Dismiss keyboard
-- hideKeyboard
+# Dismiss keyboard by tapping outside the input
+- tapOn:
+    point: "50%,20%"
 
 # Import wallet
 - tapOn:
diff --git a/ios/BitPayApp/AppDelegate.swift b/ios/BitPayApp/AppDelegate.swift
@@ -104,7 +104,10 @@ class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
     }
 
     override func bundleURL() -> URL? {
-#if DEBUG
+#if MAESTRO
+        // On CI there is no Metro server — use the embedded bundle (requires FORCE_BUNDLING=YES in xcodebuild)
+        return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#elseif DEBUG
         return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
 #else
         return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
