From ed2969bd7f7480b0464484cf88f0f5d28bf0764d Mon Sep 17 00:00:00 2001 From: Ashish Bhatia Date: Sat, 20 Jul 2024 21:17:14 -0700 Subject: [PATCH] ci: switch API 26 and 29 tests back to `macos-latest` The emulator hangs forever on `ubuntu-latest` --- .github/workflows/adbe-unittests-api26.yml | 14 +++++--------- .github/workflows/adbe-unittests-api29.yml | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/adbe-unittests-api26.yml b/.github/workflows/adbe-unittests-api26.yml index 342afba..9cb3983 100644 --- 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 index a1f12b0..fcbd88a 100644 --- 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'