Skip to content

Commit 85e9169

Browse files
committed
Use the "download" property from the android-sdk.json API for the download artifact
1 parent 9ad56a6 commit 85e9169

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,20 @@ jobs:
101101
- name: Get Latest Toolchain Info
102102
run: |
103103
sdk_json=$(curl -fsSL "https://www.swift.org/api/v1/install/dev/main/android-sdk.json") || fatal "Failed to fetch android-sdk development snapshots"
104+
download=$(echo "$sdk_json" | jq -r '.[0].download')
104105
snapshot_tag=$(echo "$sdk_json" | jq -r '.[0].dir')
105106
checksum=$(echo "$sdk_json" | jq -r '.[0].checksum')
106107
107108
echo "SWIFT_TOOLCHAIN_VERSION=${snapshot_tag}" >> ${GITHUB_ENV}
108109
echo "SWIFT_ANDROID_SDK_VERSION=${snapshot_tag}" >> ${GITHUB_ENV}
110+
echo "SWIFT_ANDROID_SDK_DOWNLOAD=${download}" >> ${GITHUB_ENV}
109111
echo "SWIFT_ANDROID_SDK_CHECKSUM=${checksum}" >> ${GITHUB_ENV}
110112
111113
- name: Install Swift Host Toolchain
112114
run: swiftly install --use "${SWIFT_TOOLCHAIN_VERSION}"
113115

114116
- name: Install Swift SDK for Android
115-
run: swiftly run swift sdk install https://download.swift.org/development/android-sdk/${SWIFT_ANDROID_SDK_VERSION}/${SWIFT_ANDROID_SDK_VERSION}_android-0.1.artifactbundle.tar.gz --checksum ${SWIFT_ANDROID_SDK_CHECKSUM}
117+
run: swiftly run swift sdk install https://download.swift.org/development/android-sdk/${SWIFT_ANDROID_SDK_VERSION}/${SWIFT_ANDROID_SDK_DOWNLOAD} --checksum ${SWIFT_ANDROID_SDK_CHECKSUM}
116118

117119
- name: List Swift SDKs
118120
run: |

0 commit comments

Comments
 (0)