Skip to content

Commit 5e5cc93

Browse files
mxindendjc
authored andcommitted
fix(.github/android): pass matrix.target and increase api to v26
When extracting the emulator script into a separate file, the `matrix.target` substitution wasn't replaced with an environment variable. Follow-up to #1950.
1 parent cef42cc commit 5e5cc93

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/rust-android-run-tests-on-emulator.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ adb wait-for-device
55
while [[ -z "$(adb shell getprop sys.boot_completed | tr -d '\r')" ]]; do sleep 1; done
66

77
any_failures=0
8-
for test in $(find target/${{ matrix.target }}/debug/deps/ -type f -executable ! -name "*.so" -name "*-*"); do
8+
for test in $(find target/$TARGET/debug/deps/ -type f -executable ! -name "*.so" -name "*-*"); do
99
adb push "$test" /data/local/tmp/
1010
adb shell chmod +x /data/local/tmp/$(basename "$test")
1111
adb shell /data/local/tmp/$(basename "$test") || any_failures=1

.github/workflows/rust.yml

+2
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
sudo udevadm trigger --name-match=kvm
145145
146146
- name: Set up Android Emulator and run tests
147+
env:
148+
TARGET: ${{ matrix.target }}
147149
uses: reactivecircus/android-emulator-runner@v2
148150
with:
149151
api-level: ${{ matrix.api-level }}

0 commit comments

Comments
 (0)