Skip to content

Commit 95db37e

Browse files
committed
Fix Android CI: install Swift via swiftly, drop invalid custom SDK inputs
swift-actions/setup-swift doesn't yet recognize 6.3.2 on macOS, so install it directly with swiftly instead. Also drop custom-sdk-url without installed-sdk on the emulator test job, which the action rejects; its default resolution already fetches the same official 6.3.2 android-sdk artifact bundle.
1 parent d9ae10a commit 95db37e

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

‎.github/workflows/swift.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,15 @@ jobs:
5252
- name: Checkout
5353
uses: actions/checkout@v4
5454
- name: Install Swift
55-
uses: swift-actions/setup-swift@v2
56-
with:
57-
swift-version: ${{ env.SWIFT_VERSION }}
55+
run: |
56+
curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg
57+
installer -pkg swiftly.pkg -target CurrentUserHomeDirectory
58+
~/.swiftly/bin/swiftly init --assume-yes --skip-install
59+
echo "$HOME/.swiftly/bin" >> "$GITHUB_PATH"
60+
source ~/.swiftly/env.sh
61+
swiftly install ${{ env.SWIFT_VERSION }}
62+
swiftly use ${{ env.SWIFT_VERSION }}
63+
echo "$(swiftly use --print-location)/usr/bin" >> "$GITHUB_PATH"
5864
- name: Install Android NDK
5965
run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ANDROID_NDK_VERSION }}"
6066
- name: Install Swift SDK for Android
@@ -81,8 +87,6 @@ jobs:
8187
uses: skiptools/swift-android-action@v2
8288
with:
8389
swift-version: "6.3.2"
84-
custom-sdk-id: swift-6.3.2-RELEASE_android
85-
custom-sdk-url: https://download.swift.org/swift-6.3.2-release/android-sdk/swift-6.3.2-RELEASE/swift-6.3.2-RELEASE_android.artifactbundle.tar.gz
8690
android-api-level: 28
8791
swift-configuration: ${{ matrix.config }}
8892
free-disk-space: true

0 commit comments

Comments
 (0)