Skip to content

Commit

Permalink
ci: revert API 29 test to Mac OS
Browse files Browse the repository at this point in the history
It fails on ubuntu-latest
  • Loading branch information
ashishb committed Jul 21, 2024
1 parent a856f04 commit 953ee31
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/adbe-unittests-api26.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ 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
if: runner.os == 'Linux'
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

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/adbe-unittests-api29.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-13 # X86-based as macOS 14 onwards is ARM-based
timeout-minutes: 15

strategy:
Expand All @@ -28,6 +31,7 @@ jobs:

# Ref: https://github.com/ReactiveCircus/android-emulator-runner?tab=readme-ov-file#running-hardware-accelerated-emulators-on-linux-runners
- name: Enable KVM
if: runner.os == 'Linux'
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
Expand All @@ -43,7 +47,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'
Expand Down

0 comments on commit 953ee31

Please sign in to comment.