From 448f256205fd992db655a28518302b708ba28a88 Mon Sep 17 00:00:00 2001
From: Ivan Dlugos <dlugos.ivan@gmail.com>
Date: Thu, 1 Aug 2024 10:37:55 +0200
Subject: [PATCH] tmp: trying to fix android tests hanging

---
 .github/workflows/e2e.yml | 62 +++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 869c8de673..c9581bc331 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-  metrics:
+  # metrics:
     runs-on: ${{ matrix.runs-on }}
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
@@ -172,23 +172,23 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.73.9']
-        rn-architecture: ['legacy', 'new']
-        platform: ['android', 'ios']
+        rn-version: ['0.73.9']
+        rn-architecture: ['new']
+        platform: ['android']
         build-type: ['production']
         ios-use-frameworks: ['no', 'static', 'dynamic']
         engine: ['hermes', 'jsc']
         include:
-          - platform: ios
-            rn-version: '0.73.9'
-            runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
-            runtime: 'latest'
-            device: 'iPhone 14'
-          - platform: ios
-            rn-version: '0.65.3'
-            runs-on: macos-12
-            runtime: 'latest'
-            device: 'iPhone 14'
+        #   - platform: ios
+        #     rn-version: '0.73.9'
+        #     runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
+        #     runtime: 'latest'
+        #     device: 'iPhone 14'
+        #   - platform: ios
+        #     rn-version: '0.65.3'
+        #     runs-on: macos-12
+        #     runtime: 'latest'
+        #     device: 'iPhone 14'
           - platform: android
             runs-on: ubuntu-latest
         exclude:
@@ -332,23 +332,23 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.73.9']
-        rn-architecture: ['legacy', 'new']
-        platform: ['android', 'ios']
+        rn-version: ['0.73.9']
+        rn-architecture: ['new']
+        platform: ['android']
         build-type: ['production']
         ios-use-frameworks: ['no'] # test only no framworks
         engine: ['hermes', 'jsc']
         include:
-          - platform: ios
-            rn-version: '0.73.9'
-            runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
-            runtime: 'latest'
-            device: 'iPhone 14'
-          - platform: ios
-            rn-version: '0.65.3'
-            runs-on: macos-latest
-            runtime: 'latest'
-            device: 'iPhone 14'
+        #   - platform: ios
+        #     rn-version: '0.73.9'
+        #     runs-on: macos-14 # uses m1 https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available/
+        #     runtime: 'latest'
+        #     device: 'iPhone 14'
+        #   - platform: ios
+        #     rn-version: '0.65.3'
+        #     runs-on: macos-latest
+        #     runtime: 'latest'
+        #     device: 'iPhone 14'
           - platform: android
             runs-on: ubuntu-latest
         exclude:
@@ -417,9 +417,15 @@ jobs:
         working-directory: test/e2e
         run: yarn install
 
+      - name: Setup tmate session
+        if: ${{ matrix.platform == 'android' }}
+        uses: mxschmitt/action-tmate@v3
+
       - name: Run tests on Android
         if: ${{ matrix.platform == 'android' }}
         uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # pin@v2.31.0
+        env:
+          ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 60
         with:
           api-level: 30
           force-avd-creation: false
@@ -438,8 +444,6 @@ jobs:
             -timezone US/Pacific
           script: |
             ./scripts/e2e.mjs ${{ matrix.platform }} --test
-            # See https://github.com/ReactiveCircus/android-emulator-runner/issues/385
-            killall --signal 9 crashpad_handler
 
       - uses: actions/cache@v4
         if: ${{ matrix.platform == 'ios' }}