@@ -167,10 +167,15 @@ runs:
167
167
mkdir -p ~/swift-download
168
168
cd ~/swift-download
169
169
BASE_URL="https://download.swift.org/${{ steps.setup.outputs.swift-branch }}"
170
+
170
171
if [ ${RUNNER_OS} == 'Linux' ]; then
171
- curl -fsSL --retry 8 --retry-connrefused ${BASE_URL}/${{ steps.setup.outputs.osid }}/${{ steps.setup.outputs.swift-id }}/${{ steps.setup.outputs.swift-id }}-${{ steps.setup.outputs.osidpair }}.tar.gz --output swift.tar.gz
172
+ HOST_TOOLCHAIN_URL="${BASE_URL}/${{ steps.setup.outputs.osid }}/${{ steps.setup.outputs.swift-id }}/${{ steps.setup.outputs.swift-id }}-${{ steps.setup.outputs.osidpair }}.tar.gz"
173
+ echo "HOST_TOOLCHAIN_URL: ${HOST_TOOLCHAIN_URL}"
174
+ curl -fsSL --retry 8 --retry-connrefused ${HOST_TOOLCHAIN_URL} --output swift.tar.gz
172
175
elif [ ${RUNNER_OS} == 'macOS' ]; then
173
- curl -fsSL --retry 8 --retry-connrefused ${BASE_URL}/xcode/${{ steps.setup.outputs.swift-id }}/${{ steps.setup.outputs.swift-id }}-osx.pkg --output swift.pkg
176
+ HOST_TOOLCHAIN_URL="${BASE_URL}/xcode/${{ steps.setup.outputs.swift-id }}/${{ steps.setup.outputs.swift-id }}-osx.pkg"
177
+ echo "HOST_TOOLCHAIN_URL: ${HOST_TOOLCHAIN_URL}"
178
+ curl -fsSL --retry 8 --retry-connrefused ${HOST_TOOLCHAIN_URL} --output swift.pkg
174
179
else
175
180
echo "::error::Unsupported platform: ${RUNNER_OS}"
176
181
exit 1
@@ -216,7 +221,10 @@ runs:
216
221
217
222
mkdir -p ${RUNNER_TEMP}/swift-android-toolchain
218
223
cd ${RUNNER_TEMP}/swift-android-toolchain
219
- curl -fsSL --retry 8 --retry-connrefused https://github.com/skiptools/swift-android-toolchain/releases/download/${{ steps.setup.outputs.swift-version }}/${SWIFT_SDK_ID}.artifactbundle.tar.gz --output ${SWIFT_SDK_ID}.artifactbundle.tar.gz
224
+
225
+ ANDROID_SDK_URL="https://github.com/skiptools/swift-android-toolchain/releases/download/${{ steps.setup.outputs.swift-version }}/${SWIFT_SDK_ID}.artifactbundle.tar.gz"
226
+ echo "ANDROID_SDK_URL: ${ANDROID_SDK_URL}"
227
+ curl -fsSL --retry 8 --retry-connrefused ${ANDROID_SDK_URL} --output ${SWIFT_SDK_ID}.artifactbundle.tar.gz
220
228
221
229
# first check if it already installed (we may be running this workflow multiple times for an action, in which case it will already be present)
222
230
${SWIFT_INSTALLATION}/bin/swift sdk configure --show-configuration ${SWIFT_SDK_ID} ${SWIFT_SDK_TARGET} &> /dev/null || ${SWIFT_INSTALLATION}/bin/swift sdk install ${SWIFT_SDK_ID}.artifactbundle.tar.gz
0 commit comments