Skip to content

Commit b9d35fb

Browse files
committed
Drop Macos and aarch64-linux-android due to ReactiveCircus/android-emulator-runner#350
1 parent e633481 commit b9d35fb

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,16 @@ jobs:
9393
- uses: EmbarkStudios/cargo-deny-action@v1
9494

9595
test-android:
96+
runs-on: ubuntu-latest
97+
9698
strategy:
9799
matrix:
98100
include:
99-
- target: aarch64-linux-android
100-
runs-on: macos-latest
101-
emulator-arch: arm64-v8a
102101
- target: x86_64-linux-android
103-
runs-on: ubuntu-latest
104102
emulator-arch: x86_64
105103
- target: i686-linux-android
106-
runs-on: ubuntu-latest
107104
emulator-arch: x86
108105

109-
runs-on: ${{ matrix.runs-on }}
110-
111106
steps:
112107
- name: Checkout code
113108
uses: actions/checkout@v4
@@ -116,7 +111,7 @@ jobs:
116111
uses: actions/setup-java@v3
117112
with:
118113
distribution: 'zulu'
119-
java-version: '17' # Install Java 17 to be compatible with the Android SDK command-line tools
114+
java-version: '21'
120115

121116
- name: Install Android SDK
122117
uses: android-actions/setup-android@v2
@@ -139,7 +134,6 @@ jobs:
139134
run: cargo ndk -t ${{ matrix.target }} test --no-run
140135

141136
- name: Enable KVM group perms
142-
if: runner.os == 'Linux'
143137
run: |
144138
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
145139
sudo udevadm control --reload-rules

0 commit comments

Comments
 (0)