fix: parallelize Android E2E, cache Ruby gems, and CI improvements (#916)

boorad · web-flow · commit 669c9e52a346 · 2026-02-12T09:56:51.000-05:00
diff --git a/.claude/rules/ci-caching.xml b/.claude/rules/ci-caching.xml
@@ -37,17 +37,24 @@
     </antipattern>
   </rule>
 
-  <rule severity="HIGH" enforcement="STRICT">
-    <name>Cache Key Design</name>
-    <description>Cache keys should reflect dependencies</description>
+  <rule severity="CRITICAL" enforcement="BLOCKING">
+    <name>Cache Key Design — Immutable Keys</name>
+    <description>GitHub Actions caches are IMMUTABLE — cache/save fails if the key already exists</description>
+    <problem>
+      actions/cache/save cannot overwrite an existing cache entry. Using static keys
+      (e.g. runner.os-gradle) means the first save succeeds, but every subsequent save
+      fails with "Unable to reserve cache with key X, another job may be creating this cache."
+      Caches become permanently stale.
+    </problem>
     <guidelines>
-      <guideline>Don't use version suffixes (v2, v3) - just delete caches with gh cache delete --all</guideline>
-      <guideline>Include all files that affect cache contents in hashFiles()</guideline>
-      <guideline>DerivedData key should include everything Pods key includes, plus more</guideline>
+      <guideline>Save key MUST be unique per run: prefix-${{ github.run_id }}</guideline>
+      <guideline>Restore uses exact key + restore-keys prefix fallback to get the latest</guideline>
+      <guideline>Don't use version suffixes (v2, v3) — purge with gh cache delete --all</guideline>
+      <guideline>Old cache entries are evicted automatically by GitHub's LRU policy</guideline>
     </guidelines>
     <example>
-      Pods: runner.os-pods-hashFiles('Podfile.lock')
-      DD: runner.os-dd-hashFiles('Podfile.lock', 'package.json', 'bun.lock')-xcode16.4
+      Restore: key=runner.os-gradle-${{ github.run_id }}, restore-keys=runner.os-gradle-
+      Save:    key=runner.os-gradle-${{ github.run_id }}
     </example>
   </rule>
 
diff --git a/.github/workflows/e2e-android-test.yml b/.github/workflows/e2e-android-test.yml
@@ -23,12 +23,17 @@ on:
       - 'src/**'
       - 'packages/react-native-quick-crypto/android/**'
 
+env:
+  EMULATOR_API_LEVEL: 34
+
 jobs:
-  e2e-tests-android:
+  # ============================================================================
+  # Build Job - Gradle build + lint (runs in parallel with AVD setup)
+  # ============================================================================
+  build:
+    name: Build
     runs-on: ubuntu-latest
     env:
-      EMULATOR_API_LEVEL: 34
-      OUTPUT_DIR: ~/output
       GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.caching=true'
 
     steps:
@@ -51,11 +56,6 @@ jobs:
       - name: Install Bun
         uses: ./.github/actions/setup-bun
 
-      - name: Create Directories
-        run: |
-          mkdir -p $HOME/output
-          mkdir -p $HOME/.maestro/tests/
-
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
@@ -87,13 +87,15 @@ jobs:
             packages/react-native-quick-crypto/android/build
             node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/.cxx
             node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/build
-          key: ${{ runner.os }}-gradle
+          key: ${{ runner.os }}-gradle-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name: Build Android App
         working-directory: ./example/android
         run: |
           echo "Building Android app (x86_64 only)..."
-          ./gradlew :app:assembleDebug -PreactNativeArchitectures=x86_64 --build-cache > $HOME/output/android-build.log 2>&1
+          ./gradlew :app:assembleDebug -PreactNativeArchitectures=x86_64 --build-cache 2>&1 | tee $HOME/android-build.log
 
       - name: Run Gradle Lint
         working-directory: ./example/android
@@ -104,27 +106,166 @@ jobs:
         with:
           report-path: packages/react-native-quick-crypto/android/build/reports/lint-results-debug.xml
 
+      - name: Stop Gradle Daemon
+        if: always()
+        working-directory: ./example/android
+        run: ./gradlew --stop
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-apk
+          path: example/android/app/build/outputs/apk/debug/app-debug.apk
+          retention-days: 1
+
+      - name: Upload Build Log
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-build-log
+          path: ~/android-build.log
+          retention-days: 5
+
+      - name: Save Gradle cache
+        if: always()
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            example/android/.gradle
+            example/android/build
+            example/android/app/.cxx
+            example/android/app/build
+            packages/react-native-quick-crypto/android/.cxx
+            packages/react-native-quick-crypto/android/build
+            node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/.cxx
+            node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/build
+          key: ${{ runner.os }}-gradle-${{ github.run_id }}
+
+  # ============================================================================
+  # AVD Job - Create and cache emulator snapshot (runs in parallel with build)
+  # ============================================================================
+  avd:
+    name: Emulator
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Restore AVD cache
+        uses: actions/cache/restore@v5
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          restore-keys: |
+            avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}-
+
+      - name: Create AVD and Generate Snapshot for Caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.EMULATOR_API_LEVEL }}
+          arch: x86_64
+          profile: pixel_7_pro
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Save AVD cache
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v5
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}-${{ github.run_id }}
+
+  # ============================================================================
+  # Test Job - Run E2E tests (needs both build and AVD)
+  # ============================================================================
+  test:
+    name: Test
+    needs: [build, avd]
+    runs-on: ubuntu-latest
+    env:
+      OUTPUT_DIR: ~/output
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: '20'
+
+      - name: Install Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Create Directories
+        run: |
+          mkdir -p $HOME/output
+          mkdir -p $HOME/.maestro/tests/
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Restore node_modules cache
+        uses: actions/cache/restore@v5
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-
+
+      - name: Install Dependencies
+        run: bun install
+
+      - name: Save node_modules cache
+        uses: actions/cache/save@v5
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-modules-${{ github.run_id }}
+
+      - name: Download APK
+        uses: actions/download-artifact@v4
+        with:
+          name: android-apk
+          path: example/android/app/build/outputs/apk/debug/
+
       - name: Install Maestro CLI
         run: |
           export MAESTRO_VERSION=2.0.10
           curl -Ls "https://get.maestro.mobile.dev" | bash
           echo "$HOME/.maestro/bin" >> $GITHUB_PATH
 
       - name: Enable KVM
-        if: env.SKIP_KVM != 'true'
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
       - name: Restore AVD cache
-        uses: actions/cache@v5
-        id: avd-cache
+        uses: actions/cache/restore@v5
         with:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}
+          key: avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          restore-keys: |
+            avd-pixel7pro-${{ env.EMULATOR_API_LEVEL }}-
 
       - name: Run E2E Tests
         uses: reactivecircus/android-emulator-runner@v2
@@ -140,11 +281,6 @@ jobs:
           working-directory: ./example
           script: ./test/e2e/scripts/test-android.sh
 
-      - name: Stop Gradle Daemon
-        if: always()
-        working-directory: ./example/android
-        run: ./gradlew --stop
-
       - name: Collect Screenshots
         if: always()
         run: |
@@ -176,23 +312,6 @@ jobs:
             ${{ env.OUTPUT_DIR }}/screenshots/*.png
           retention-days: 5
 
-      - name: Save Gradle cache
-        if: always()
-        uses: actions/cache/save@v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            example/android/.gradle
-            example/android/build
-            example/android/app/.cxx
-            example/android/app/build
-            packages/react-native-quick-crypto/android/.cxx
-            packages/react-native-quick-crypto/android/build
-            node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/.cxx
-            node_modules/.bun/react-native-nitro-modules*/node_modules/react-native-nitro-modules/android/build
-          key: ${{ runner.os }}-gradle
-
       - name: Exit with Test Result
         if: always()
         run: |
diff --git a/.github/workflows/e2e-ios-test.yml b/.github/workflows/e2e-ios-test.yml
@@ -58,6 +58,13 @@ jobs:
       - name: Install Bun
         uses: ./.github/actions/setup-bun
 
+      - name: Setup Ruby (bundle)
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.4
+          bundler-cache: true
+          working-directory: example
+
       - name: Create Directories
         run: |
           mkdir -p $HOME/output
@@ -76,14 +83,18 @@ jobs:
             ~/Library/Caches/CocoaPods
             packages/react-native-quick-crypto/ios/libsodium-stable
             packages/react-native-quick-crypto/deps
-          key: ${{ runner.os }}-pods
+          key: ${{ runner.os }}-pods-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
 
       - name: Restore DerivedData cache
         id: dd-cache
         uses: actions/cache/restore@v5
         with:
           path: ${{ env.DERIVED_DATA_PATH }}
-          key: ${{ runner.os }}-dd
+          key: ${{ runner.os }}-dd-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-dd-
 
       - name: Boot iOS Simulator (background)
         run: |
@@ -228,14 +239,14 @@ jobs:
             ~/Library/Caches/CocoaPods
             packages/react-native-quick-crypto/ios/libsodium-stable
             packages/react-native-quick-crypto/deps
-          key: ${{ runner.os }}-pods
+          key: ${{ runner.os }}-pods-${{ github.run_id }}
 
       - name: Save DerivedData cache
         if: always()
         uses: actions/cache/save@v5
         with:
           path: ${{ env.DERIVED_DATA_PATH }}
-          key: ${{ runner.os }}-dd
+          key: ${{ runner.os }}-dd-${{ github.run_id }}
 
       - name: Exit with Test Result
         if: always()
