Skip to content

Remove swift SDK for android suffix #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahmishal merged 2 commits into from
Dec 2, 2025
Merged

Remove swift SDK for android suffix #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8527544
Remove swift SDK for android suffix
justice-adams-apple Dec 2, 2025
f84c379
remove android_sdk_bundle_dir
justice-adams-apple Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/scripts/install-and-build-with-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,6 @@ find_latest_sdk_snapshot() {
SWIFT_VERSION_BRANCH=""
ANDROID_SDK_TAG=""
ANDROID_SDK_CHECKSUM=""
# TODO: we will be removing the "-0.1" suffix in a future nightly
ANDROID_SDK_PATH_SUFFIX="-0.1"
ANDROID_SDK_PATH_SEP="-"

STATIC_LINUX_SDK_TAG=""
Expand Down Expand Up @@ -553,10 +551,8 @@ install_android_sdk() {

log "Installing Android Swift SDK: $ANDROID_SDK_TAG"

local android_sdk_name="${ANDROID_SDK_TAG}_android${ANDROID_SDK_PATH_SUFFIX}"
local android_sdk_name="${ANDROID_SDK_TAG}_android"
local android_sdk_bundle_name="${android_sdk_name}.artifactbundle"
# TODO: remove once the next nightly changes the "-" to "_" in the name
local android_sdk_bundle_dir="${android_sdk_bundle_name//_android/${ANDROID_SDK_PATH_SEP}android}"
local android_sdk_filename="${android_sdk_bundle_name}.tar.gz"
local sdk_url="${ANDROID_SDK_DOWNLOAD_ROOT}/${ANDROID_SDK_TAG}/${android_sdk_filename}"

Expand Down Expand Up @@ -590,7 +586,7 @@ install_android_sdk() {
export ANDROID_NDK_HOME="${PWD}"/android-ndk-"${android_ndk_version}"
fi

./swift-sdks/"${android_sdk_bundle_dir}"/swift-android/scripts/setup-android-sdk.sh
./swift-sdks/"${android_sdk_bundle_name}"/swift-android/scripts/setup-android-sdk.sh
cd -
}

Expand Down Expand Up @@ -664,7 +660,7 @@ build() {
if [[ "$INSTALL_ANDROID" == true ]]; then
log "Running Swift build with Android Swift SDK"

local sdk_name="${ANDROID_SDK_TAG}${ANDROID_SDK_PATH_SEP}android${ANDROID_SDK_PATH_SUFFIX}"
local sdk_name="${ANDROID_SDK_TAG}${ANDROID_SDK_PATH_SEP}android"

alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'

Expand Down