Skip to content

Commit 68e1eab

Browse files
committed
Start building the 6.3 devel snapshots on the CI
1 parent 6524338 commit 68e1eab

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/sdks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.2 | cut -d- -f2)
2525
SWIFT_TAG="swift-${LATEST_TOOLCHAIN_VERSION}-RELEASE"
2626
elif [ ${{ matrix.version }} = 'devel' ]; then
27-
LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
28-
SWIFT_TAG="swift-6.2-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
27+
LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.3-DEV | cut -d- -f8-10)
28+
SWIFT_TAG="swift-6.3-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
2929
else
3030
LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
3131
SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
@@ -128,11 +128,11 @@ jobs:
128128
129129
git apply -C1 swift-android.patch swift-android-ci.patch
130130
BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
131-
if ${{ matrix.version == 'trunk' }}; then
132-
git apply swift-android-trunk-spawn.patch
133-
BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
131+
if ${{ matrix.version == 'release' }}; then
132+
git apply swift-android-ci-release.patch swift-android-release.patch
134133
else
135-
git apply swift-android-ci-except-trunk.patch swift-android-except-trunk.patch
134+
git apply swift-android-spawn.patch
135+
BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
136136
fi
137137
138138
perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Next, apply two patches from this repo to the Swift source, which make
146146
modifications for NDK 27 and [the Foundation rewrite in Swift 6 that was merged
147147
last summer](https://www.swift.org/blog/foundation-preview-now-available/):
148148
```
149-
git apply swift-android.patch swift-android-except-trunk.patch
149+
git apply swift-android.patch swift-android-release.patch
150150
```
151151

152152
After making sure [needed build tools like python 3, CMake, and ninja](https://github.com/swiftlang/swift/blob/release/6.2/docs/HowToGuides/GettingStarted.md#linux)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)