File tree Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -550,7 +550,8 @@ install_android_sdk() {
550550 # FIXME: we will be removing the "-0.1" suffix
551551 local android_sdk_suffix=" -0.1"
552552
553- local android_sdk_filename=" ${ANDROID_SDK_TAG} _android${android_sdk_suffix} .artifactbundle.tar.gz"
553+ local android_sdk_bundle_name=" ${ANDROID_SDK_TAG} _android${android_sdk_suffix} .artifactbundle"
554+ local android_sdk_filename=" ${android_sdk_bundle_name} .tar.gz"
554555 local sdk_url=" ${ANDROID_SDK_DOWNLOAD_ROOT} /${ANDROID_SDK_TAG} /${android_sdk_filename} "
555556
556557 log " Running: ${SWIFT_EXECUTABLE_FOR_ANDROID_SDK} sdk install ${sdk_url} --checksum ${ANDROID_SDK_CHECKSUM} "
@@ -560,6 +561,9 @@ install_android_sdk() {
560561 else
561562 fatal " Failed to install Android Swift SDK"
562563 fi
564+
565+ # now setup the link to the local ANDROID_NDK_HOME
566+ ${HOME} /.config/swiftpm/swift-sdks/${android_sdk_bundle_name} /swift-android/scripts/setup-android-sdk.sh
563567}
564568
565569install_static_linux_sdk () {
Original file line number Diff line number Diff line change 2424 run : |
2525 curl -s --retry 3 https://raw.githubusercontent.com/swift-android-sdk/github-workflows/refs/heads/android-workflow/.github/workflows/scripts/install-and-build-with-sdk.sh | \
2626 bash -s -- --android --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
27+ - name : Check Binary
28+ run : file .build/debug/hello
29+
2730 - name : Build Static Linux
2831 run : |
2932 curl -s --retry 3 https://raw.githubusercontent.com/swift-android-sdk/github-workflows/refs/heads/android-workflow/.github/workflows/scripts/install-and-build-with-sdk.sh | \
3033 bash -s -- --static --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
34+
35+ - name : Check Binary
36+ run : file .build/debug/hello
37+
You can’t perform that action at this time.
0 commit comments