From 8f94bfb43e70950c84b3adfe310810a2645775d1 Mon Sep 17 00:00:00 2001
From: ComplexSpaces <complexspacescode@gmail.com>
Date: Mon, 11 Mar 2024 17:21:33 -0700
Subject: [PATCH] Update Android test action and use Linux runners instead

---
 .github/workflows/ci.yml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34f572a4..f0d65151 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,16 +116,26 @@ jobs:
       - name: Test (${{ matrix.os }})
         run: cargo test
 
-      - name: Setup Android test environment
+  test_android:
+    name: "Test (Android)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - 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: Setup Java
         uses: actions/setup-java@v2
-        if: matrix.os == 'macos-latest'
         with:
           distribution: 'temurin'
           java-version: '11'
 
-      - name: Test (Android)
-        uses: reactivecircus/android-emulator-runner@d7b53ddc6e44254e1f4cf4a6ad67345837027a66 # 2.26.0
-        if: matrix.os == 'macos-latest'
+      - name: Run Android tests
+        uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # 2.30.1
         with:
           api-level: 28 # Android 9, Pie.
           arch: x86_64
@@ -152,7 +162,7 @@ jobs:
       - name: Upload Android test results
         uses: actions/upload-artifact@v3
         # Upload test results if they fail
-        if: matrix.os == 'macos-latest' && failure()
+        if: failure()
         with:
           name: android-test-results
           retention-days: 7
@@ -160,8 +170,8 @@ jobs:
             emulator.log
             /Users/runner/work/rustls-platform-verifier/rustls-platform-verifier/android/rustls-platform-verifier/build/outputs/androidTest-results/connected/test-result.pb
 
-      # TODO: Test iOS in CI too.
-
+  # TODO: Test iOS in CI too.
+     
   test-freebsd:
     name: Test (FreeBSD)
     runs-on: ubuntu-latest