Skip to content

Commit 544da6c

Browse files
committed
create a variable STATIC_LINUX_SDK_NAME
1 parent bca81f7 commit 544da6c

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/scripts/install-and-build-with-sdk.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,8 @@ ANDROID_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/androi
627627
STATIC_LINUX_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/static-sdk"
628628
WASM_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/wasm-sdk"
629629

630+
STATIC_LINUX_SDK_NAME="${STATIC_LINUX_SDK_TAG}_static-linux-0.1.0"
631+
630632
install_android_ndk() {
631633
local ndk_version="$1"
632634
log "Installing Android NDK: $ndk_version"
@@ -693,14 +695,14 @@ install_android_sdk() {
693695

694696
install_static_linux_sdk() {
695697
# Check if the Static Linux Swift SDK is already installed
696-
if "$SWIFT_EXECUTABLE_FOR_STATIC_LINUX_SDK" sdk list 2>/dev/null | grep -q "^${STATIC_LINUX_SDK_TAG}_static-linux-0.0.1"; then
698+
if "$SWIFT_EXECUTABLE_FOR_STATIC_LINUX_SDK" sdk list 2>/dev/null | grep -q "^${STATIC_LINUX_SDK_NAME}"; then
697699
log "✅ Static Linux Swift SDK ${STATIC_LINUX_SDK_TAG} is already installed, skipping installation"
698700
return 0
699701
fi
700702

701703
log "Installing Static Linux Swift SDK: $STATIC_LINUX_SDK_TAG"
702704

703-
local static_linux_sdk_filename="${STATIC_LINUX_SDK_TAG}_static-linux-0.0.1.artifactbundle.tar.gz"
705+
local static_linux_sdk_filename="${STATIC_LINUX_SDK_NAME}.artifactbundle.tar.gz"
704706
local sdk_url="${STATIC_LINUX_SDK_DOWNLOAD_ROOT}/${STATIC_LINUX_SDK_TAG}/${static_linux_sdk_filename}"
705707

706708
if ! swift_sdk_install_with_retry "$SWIFT_EXECUTABLE_FOR_STATIC_LINUX_SDK" "$sdk_url" "$STATIC_LINUX_SDK_CHECKSUM" "Static Linux Swift"; then
@@ -782,7 +784,7 @@ build() {
782784
if [[ "$INSTALL_STATIC_LINUX" == true ]]; then
783785
log "Running Swift build with Static Linux Swift SDK"
784786

785-
local sdk_name="${STATIC_LINUX_SDK_TAG}_static-linux-0.0.1"
787+
local sdk_name="${STATIC_LINUX_SDK_NAME}"
786788
alias swift='$SWIFT_EXECUTABLE_FOR_STATIC_LINUX_SDK'
787789
local build_command="$SWIFT_BUILD_COMMAND --swift-sdk $sdk_name"
788790
if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then

0 commit comments

Comments
 (0)