Skip to content

Commit d057394

Browse files
committed
Disable cross-compiling trunk SwiftPM on the CI for today, as it has a new dependency on swift-build
1 parent 60c72d1 commit d057394

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/sdks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ jobs:
131131
if [ ${{ matrix.version }} = 'release' ]; then
132132
git apply swift-android-ci-release.patch swift-android-foundation-release.patch
133133
perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
134-
LSP_BUILD="--sourcekit-lsp"
134+
LSP_BUILD="-p --sourcekit-lsp"
135135
else
136136
git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch
137137
if [ ${{ matrix.version }} = 'devel' ]; then
138138
perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
139-
LSP_BUILD="--sourcekit-lsp"
139+
LSP_BUILD="-p --sourcekit-lsp"
140140
git apply swift-android-testing-devel.patch
141141
else
142142
git apply swift-android-testing-trunk.patch
@@ -165,7 +165,7 @@ jobs:
165165
cp $SDK/usr/include/execinfo.h $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include
166166
fi
167167
168-
./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild $LSP_BUILD $TESTING_BUILD
168+
./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b --install-llbuild $LSP_BUILD $TESTING_BUILD
169169
170170
if [ ${{ matrix.version }} != 'release' ]; then
171171
rm $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift

0 commit comments

Comments
 (0)