all

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

.github/workflows/main.yml

@@ -13,26 +13,13 @@ env:
 
 jobs:
   android-test:
-    name: ${{ format('{0} {1}', matrix.platform.target, matrix.features)}}
-    runs-on: ${{ matrix.platform.os }}
+    name: ${{ format('x86_64-linux-android {1}', matrix.features)}}
+    runs-on: ubuntu-24.04
     env:
       RUST_BACKTRACE: 1
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - {
-              target: aarch64-linux-android,
-              avd_arch: arm64-v8a,
-              arch: aarch64,
-              os: macos-13,
-            }
-          - {
-              target: x86_64-linux-android,
-              avd_arch: x86_64,
-              arch: x86_64,
-              os: ubuntu-24.04,
-            }
         features:
           [
             "",
@@ -45,14 +32,13 @@ jobs:
         id: toolchain
         uses: dtolnay/rust-toolchain@1.81.0
         with:
-          targets: ${{ matrix.platform.target }}
+          targets: x86_64-linux-android
 
       - uses: taiki-e/install-action@v2
         with:
           tool: cargo-dinghy
 
       - name: Enable KVM
-        if: ${{ contains(matrix.platform.os, 'ubuntu') }}
         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
@@ -65,7 +51,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-25-${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{runner.arch}}
+          key: avd-30
 
       - name: Create directory for avd
         # This shouldn't be necesary but this is a work around for
@@ -77,9 +63,9 @@ jobs:
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 25
+          api-level: 30
           force-avd-creation: false
-          arch: ${{ matrix.platform.avd_arch }}
+          arch: x86_64
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
           script: echo "Generated AVD snapshot for caching."
@@ -89,15 +75,15 @@ jobs:
         env:
           RANLIB: "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
         with:
-          api-level: 25
-          arch: ${{ matrix.platform.avd_arch }}
+          api-level: 30
+          arch: x86_64
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           script: |
             cargo dinghy all-platforms
             cargo dinghy all-devices
-            cargo dinghy -p auto-android-${{ matrix.platform.arch }}-api25 test --features "${{ matrix.features }}" -- --test-threads 1
+            cargo dinghy -p auto-android-x86_64-api30 test --features "${{ matrix.features }}" -- --test-threads 1 && killall -INT crashpad_handler || true
   Format:
     name: Run `rustfmt`
     runs-on: ubuntu-24.04