Skip to content

Commit a4a759f

Browse files
committed
Try building tests with --static-swift-stdlib to avoid need to copy up dependencies
1 parent 8f608fc commit a4a759f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ jobs:
213213
adb shell /data/local/tmp/hello
214214
215215
- name: Install testing prerequisites on Android Emulator
216+
# not needed when building with --static-swift-stdlib
217+
if: false
216218
run: |
217219
cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
218220
# add necessary dependencies
@@ -232,17 +234,20 @@ jobs:
232234
git clone https://github.com/${ORG}/${PACKAGE}
233235
cd ${PACKAGE}
234236
235-
swiftly run swift build --swift-sdk "${ANDROID_EMULATOR_ARCH_TRIPLE}-unknown-linux-android${ANDROID_API}" --build-tests +"${SWIFT_TOOLCHAIN_VERSION}"
237+
swiftly run swift build --swift-sdk "${ANDROID_EMULATOR_ARCH_TRIPLE}-unknown-linux-android${ANDROID_API}" --build-tests --static-swift-stdlib +"${SWIFT_TOOLCHAIN_VERSION}"
236238
237239
adb push .build/debug/${PACKAGE}PackageTests.xctest /data/local/tmp/
238240
# copy up any test resources
239241
adb push .build/debug/*.resources /data/local/tmp/ || true
240242
241243
# push potential dependent libraries
242244
adb push $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/*/sysroot/usr/lib/${ANDROID_EMULATOR_ARCH_TRIPLE}-linux-android/libc++_shared.so /data/local/tmp/
243-
cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
244-
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/
245-
cd -
245+
246+
# Since we are building with --static-swift-stdlib, we don't
247+
# need to copy any of the other libraries
248+
#cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
249+
#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/
250+
#cd -
246251
247252
adb shell ls /data/local/tmp/
248253
@@ -275,11 +280,9 @@ jobs:
275280
run: ./run-tests.sh apple/swift-crypto
276281

277282
- name: Run swift-nio tests
278-
if: false
279283
run: ./run-tests.sh apple/swift-nio
280284

281285
- name: Run swift-argument-parser tests
282-
if: false
283286
run: ./run-tests.sh apple/swift-argument-parser
284287

285288
- name: Android - Show Emulator Log

0 commit comments

Comments
 (0)