CI(mac_android): try to fix macOS Android CI

test(): tune timeouts
socketsupply · Dec 14, 2023 · 7f9da39 · 7f9da39
1 parent d1b427c
commit 7f9da39
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,6 +47,20 @@ jobs:
         run: |
           brew install automake
 
+      - name: Android FTE
+        run: |
+          ./bin/android-functions.sh --android-fte --yes-deps
+        env:
+          VERBOSE: 1
+          DEBUG: 1
+          CI: true
+          SSC_ANDROID_CI: true
+          # Clear variables because CI supplied installs are out of date
+          ANDROID_HOME:
+          JAVA_HOME:
+          ANDROID_SUPPORTED_ABIS: x86_64
+          NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_PAT }}
+
       - name: Build Socket Runtime
         run: |
           VERBOSE=1 ./bin/install.sh
@@ -103,7 +117,7 @@ jobs:
   ios_macos_tests:
     name: iOS (on macOS) tests
     runs-on: macOS-13
-    timeout-minutes: 20
+    timeout-minutes: 40
     needs: mac_build
 
     steps:
@@ -136,7 +150,7 @@ jobs:
   android_mac_tests:
     name: Android (on macOS) tests
     runs-on: macos-13
-    timeout-minutes: 60
+    timeout-minutes: 30
     needs: mac_build
 
     steps:
@@ -221,6 +235,20 @@ jobs:
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test
           sudo apt install -y gcc-12 g++-12 libpthread-stubs0-dev libwebkit2gtk-4.1-dev at-spi2-core
 
+      - name: Android FTE
+        run: |
+          ./bin/android-functions.sh --android-fte --yes-deps
+        env:
+          VERBOSE: 1
+          DEBUG: 1
+          CI: true
+          SSC_ANDROID_CI: true
+          # Clear variables because CI supplied installs are out of date
+          ANDROID_HOME:
+          JAVA_HOME:
+          ANDROID_SUPPORTED_ABIS: x86_64
+          NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_PAT }}
+
       - name: Build Socket Runtime
         run: |
           yes | sdkmanager --licenses > /dev/null
@@ -282,7 +310,7 @@ jobs:
   android_linux_tests:
     name: Android (on Linux) tests
     runs-on: ubuntu-latest-m
-    timeout-minutes: 60
+    timeout-minutes: 30
     needs: linux_build
 
     steps:

diff --git a/test/scripts/poll-adb-logcat.sh b/test/scripts/poll-adb-logcat.sh
@@ -43,7 +43,7 @@ function watchdog_file_update() {
   fi
 }
 
-function watchdog_file_exists() {  
+function watchdog_file_exists() {
   if [ -f "$poll_adb_watchdog_file" ]; then
     data="$(cat "$poll_adb_watchdog_file")"
     if [ -z "$data" ]; then
@@ -79,7 +79,7 @@ echo "App start timeout: $timeout"
 echo ""
 while [ -z "$pid" ] && (( count < timeout )); do
   count_output="$count_output$count..." # Ouput doesn't flush in CI with echo -n, rebuild line
-  
+
   [[ -n "$CI" ]] && echo "$count..."
   [[ -z "$CI" ]] && echo -e "\e[1A\e[K$count_output" # Replace previous line, doesn't work in CI
   pid="$($adb shell ps | grep "$id" | awk '{print $2}' 2>/dev/null)"
@@ -139,17 +139,17 @@ done < <($adb logcat --pid="$pid") & logcat_pid=$!
 # Handle situation where logcat loop doesn't catch exit, because eg an unexpected error condition occured that isn't handled by the text processing above
 # This section dumps the entire process log after it has gone away, note that we don't want the entire log on failed tests that were successfully reported
 count=0
-timeout=300
+timeout=600
 [[ -z "$CI" ]] && timeout=30
 [[ -z "$CI" ]] && echo "Waiting 30s before aborting tests..."
-[[ -n "$CI" ]] && echo "Waiting 5m before aborting tests..."
+[[ -n "$CI" ]] && echo "Waiting 10m before aborting tests..."
 
 # while [[ "$(watchdog_file_exists)" == "0" ]]; do
 while (( count < timeout )) ; do
   if [[ "$(watchdog_file_exists)" != "0" ]]; then
     break
   fi
-  
+
   (( count > 0 )) && (( count % 30 == 0 )) && echo "Timeout count: $count/$timeout"
   sleep 1
   (( count++ ))

diff --git a/test/src/application.js b/test/src/application.js
@@ -625,7 +625,7 @@ if (!['android', 'ios', 'win32'].includes(process.platform)) {
     const doesRestart = await Promise.race([
       new Promise(resolve => window.addEventListener('backend:ready', () => resolve(true), { once: true })),
       // needs more time to restart
-      new Promise(resolve => setTimeout(() => resolve(false), 1024))
+      new Promise(resolve => setTimeout(() => resolve(false), 2048))
     ])
     t.ok(doesRestart, 'emits a backend:ready event')
   })