Skip to content

Commit 358afdd

Browse files
committed
See if setting a resource dir symlink is no longer needed on the CI
1 parent 5393c3c commit 358afdd

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

.github/workflows/sdks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ jobs:
142142
fi
143143
TESTING_BUILD="--swift-testing --install-swift-testing"
144144
git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch
145+
unset ANDROID_NDK_ROOT
145146
fi
146147
147148
perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift

swift-android-foundation-except-release.patch

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
2-
index 16e05052609..7ab8cebfab8 100755
3-
--- a/swift/utils/build-script-impl
4-
+++ b/swift/utils/build-script-impl
5-
@@ -2622,6 +2622,7 @@ for host in "${ALL_HOSTS[@]}"; do
6-
echo "Cleaning the libdispatch build directory"
7-
call rm -rf "${LIBDISPATCH_BUILD_DIR}"
8-
fi
9-
+ call ln -sf "${SWIFT_BUILD_PATH}/lib/swift" "${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib"
10-
11-
cmake_options=(
12-
-DENABLE_SWIFT=YES
131
diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
142
index 324d1a77eea..e88601a8701 100644
153
--- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py

0 commit comments

Comments
 (0)