ci: switch API 26 and 29 tests back to macos-latest

The emulator hangs forever on `ubuntu-latest`
ashishb · Jul 21, 2024 · ed2969b · ed2969b
1 parent 3610a02
commit ed2969b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/adbe-unittests-api26.yml b/.github/workflows/adbe-unittests-api26.yml
@@ -14,7 +14,10 @@ concurrency:
 
 jobs:
   testOnApi26:
-    runs-on: ubuntu-latest
+    # This hangs on ubuntu-latest
+    # Ref: https://github.com/ashishb/adb-enhanced/pull/239
+    # Ref: https://github.com/ReactiveCircus/android-emulator-runner/issues/385
+    runs-on: macos-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,13 +29,6 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
-      - 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: Gradle cache
         uses: gradle/gradle-build-action@v3
 
@@ -43,7 +39,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-${{ runner.os }}-${{ matrix.api-level }}
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'

diff --git a/.github/workflows/adbe-unittests-api29.yml b/.github/workflows/adbe-unittests-api29.yml
@@ -14,7 +14,10 @@ concurrency:
 
 jobs:
   testOnApi29:
-    runs-on: ubuntu-latest
+    # This hangs on ubuntu-latest
+    # Ref: https://github.com/ashishb/adb-enhanced/pull/239
+    # Ref: https://github.com/ReactiveCircus/android-emulator-runner/issues/385
+    runs-on: macos-latest
     timeout-minutes: 15
 
     strategy:
@@ -26,13 +29,6 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      # Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
-      - 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: Gradle cache
         uses: gradle/gradle-build-action@v3
 
@@ -43,7 +39,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}
+          key: avd-${{ runner.os }}-${{ matrix.api-level }}
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'