@@ -85,12 +85,12 @@ jobs:
8585 - name : Install Swiftly
8686 run : |
8787 if [[ "${RUNNER_OS}" == "macOS" ]]; then
88- curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg
88+ curl -fsSL - O https://download.swift.org/swiftly/darwin/swiftly.pkg
8989 installer -pkg swiftly.pkg -target CurrentUserHomeDirectory
9090 ~/.swiftly/bin/swiftly init --quiet-shell-followup
9191 . "${SWIFTLY_HOME_DIR:-$HOME/.swiftly}/env.sh"
9292 elif [[ "${RUNNER_OS}" == "Linux" ]]; then
93- curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
93+ curl -fsSL - O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
9494 tar zxf swiftly-$(uname -m).tar.gz
9595 ./swiftly init --quiet-shell-followup
9696 . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"
@@ -109,13 +109,13 @@ jobs:
109109
110110 echo "SWIFT_TOOLCHAIN_VERSION=${snapshot_tag}" >> ${GITHUB_ENV}
111111 echo "SWIFT_ANDROID_SDK_VERSION=${snapshot_tag}" >> ${GITHUB_ENV}
112- echo "SWIFT_ANDROID_SDK_CHECKSUM=${checksum} >> ${GITHUB_ENV}
112+ echo "SWIFT_ANDROID_SDK_CHECKSUM=${checksum}" >> ${GITHUB_ENV}
113113
114114 - name : Install Swift Host Toolchain
115115 run : swiftly install --use "${SWIFT_TOOLCHAIN_VERSION}"
116116
117117 - name : Install Swift SDK for Android
118- run : swift sdk install https://download.swift.org/development/android-sdk/${SWIFT_ANDROID_SDK_VERSION}-a /${SWIFT_ANDROID_SDK_VERSION}-a_android -0.1.artifactbundle.tar.gz --checksum ${SWIFT_ANDROID_SDK_CHECKSUM}
118+ 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}
119119
120120 - name : List Swift SDKs
121121 run : swift sdk list
@@ -140,7 +140,7 @@ jobs:
140140 - name : Setup Swift SDK for Android
141141 run : |
142142 cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
143- ./swift-sdks/${SWIFT_ANDROID_SDK_VERSION}-a-android-0.1 .artifactbundle/swift-android/scripts/setup-android-sdk.sh
143+ ./swift-sdks/${SWIFT_ANDROID_SDK_VERSION}* .artifactbundle/swift-android/scripts/setup-android-sdk.sh
144144
145145 - name : Build Swift Executable for Android
146146 run : |
0 commit comments