Skip to content

Commit f0e0d8e

Browse files
committed
Always copy up dependent shared object files to emulator
1 parent 67e35a2 commit f0e0d8e

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
# run: emulator -list-avds
196196

197197
- name: Android - Boot
198-
run: nohup emulator -memory 4096 -avd "${ANDROID_EMULATOR_NAME}" -wipe-data -no-window -accel off -no-accel -gpu "${ANDROID_EMULATOR_GPU}" -no-snapshot -noaudio -no-boot-anim &
198+
run: nohup emulator -memory 4096 -avd "${ANDROID_EMULATOR_NAME}" -wipe-data -no-window -accel off -no-accel -gpu "${ANDROID_EMULATOR_GPU}" -no-snapshot -noaudio -no-boot-anim 2>&1 > emulator.log &
199199

200200
- name: ADB Wait For Device
201201
run: adb wait-for-any-device
@@ -242,6 +242,11 @@ jobs:
242242
243243
adb push .build/debug/${PACKAGE}PackageTests.xctest /data/local/tmp/
244244
245+
# push potential dependent libraries
246+
cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
247+
adb push swift-sdks/${SWIFT_ANDROID_SDK_VERSION}*.artifactbundle/swift-android/swift-resources/usr/lib/swift-${ANDROID_EMULATOR_ARCH_TRIPLE}/android/*.so /data/local/tmp/
248+
cd -
249+
245250
adb shell ls /data/local/tmp/
246251
247252
adb shell /data/local/tmp/${PACKAGE}PackageTests.xctest
@@ -279,3 +284,7 @@ jobs:
279284
- name: Run swift-nio tests
280285
run: ./run-tests.sh apple/swift-nio
281286

287+
- name: Android - Show Emulator Log
288+
if: always()
289+
run: cat emulator.log || true
290+

0 commit comments

Comments
 (0)