Skip to content

Commit ccd2f05

Browse files
committed
Fix ubuntu-24.04-arm runner
1 parent 4969d23 commit ccd2f05

File tree

1 file changed

+23
-18
lines changed

1 file changed

+23
-18
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,43 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
#- name: 'macOS 15 ARM'
14-
# os: 'macos-15'
15-
# ANDROID_API: 28
16-
# EMULATOR_ARCH: 'arm64-v8a'
17-
# EMULATOR_ARCH_TRIPLE: 'aarch64'
18-
# EMULATOR_GPU: 'swiftshader_indirect'
19-
20-
- name: 'macOS 15 X86 API 28'
13+
- name: 'macOS 15 X64 API 28'
2114
os: 'macos-15-intel'
2215
ANDROID_API: 28
2316
EMULATOR_ARCH: 'x86_64'
2417
EMULATOR_ARCH_TRIPLE: 'x86_64'
2518
EMULATOR_GPU: 'swiftshader_indirect'
2619

27-
- name: 'Ubuntu X86 API 28'
20+
- name: 'Ubuntu X64 API 28'
2821
os: 'ubuntu-latest'
2922
ANDROID_API: 28
3023
EMULATOR_ARCH: 'x86_64'
3124
EMULATOR_ARCH_TRIPLE: 'x86_64'
3225
EMULATOR_GPU: 'swiftshader_indirect'
3326

27+
- name: 'Ubuntu X64 API 35'
28+
os: 'ubuntu-latest'
29+
ANDROID_API: 35
30+
EMULATOR_ARCH: 'x86_64'
31+
EMULATOR_ARCH_TRIPLE: 'x86_64'
32+
EMULATOR_GPU: 'swiftshader_indirect'
33+
3434
- name: 'Ubuntu ARM API 28'
3535
os: 'ubuntu-24.04-arm'
3636
ANDROID_API: 28
3737
EMULATOR_ARCH: 'arm64-v8a'
3838
EMULATOR_ARCH_TRIPLE: 'aarch64'
3939
EMULATOR_GPU: 'swiftshader_indirect'
4040

41-
- name: 'Ubuntu X86 API 35'
42-
os: 'ubuntu-latest'
43-
ANDROID_API: 35
44-
EMULATOR_ARCH: 'x86_64'
45-
EMULATOR_ARCH_TRIPLE: 'x86_64'
46-
EMULATOR_GPU: 'swiftshader_indirect'
41+
# Cannot test on ARM macOS because Android emulator required nested
42+
# virtualization
43+
#- name: 'macOS 15 ARM'
44+
# os: 'macos-15'
45+
# ANDROID_API: 28
46+
# EMULATOR_ARCH: 'arm64-v8a'
47+
# EMULATOR_ARCH_TRIPLE: 'aarch64'
48+
# EMULATOR_GPU: 'swiftshader_indirect'
49+
4750
runs-on: ${{ matrix.os }}
4851
env:
4952
ANDROID_API: ${{ matrix.ANDROID_API }}
@@ -140,9 +143,11 @@ jobs:
140143
- name: Enable KVM
141144
if: runner.os == 'Linux'
142145
run: |
143-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
144-
sudo udevadm control --reload-rules
145-
sudo udevadm trigger --name-match=kvm
146+
if [[ "${RUNNER_ARCH}" == "X64" ]]; then
147+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
148+
sudo udevadm control --reload-rules
149+
sudo udevadm trigger --name-match=kvm
150+
fi
146151
147152
- name: Android SDKs - setup environment
148153
run: yes y | sdkmanager --licenses > /dev/null

0 commit comments

Comments
 (0)