Update CI

Author: marcprux

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

@@ -32,6 +32,10 @@ while [[ $# -gt 0 ]]; do
             INSTALL_ANDROID=true
             shift
             ;;
+        --android-sdk=*)
+            ANDROID_SDK_NAME="${1#*=}"
+            shift
+            ;;
         --static)
             INSTALL_STATIC_LINUX=true
             shift
@@ -637,12 +641,12 @@ build() {
     if [[ "$INSTALL_ANDROID" == true ]]; then
         log "Running Swift build with Android Swift SDK"
 
-        # FIXME: we will be changing the name in the next nightly
+        # FIXME: we will be trimming "-0.1" from the name in the next nightly
         local sdk_name="${ANDROID_SDK_TAG}-android-0.1"
         #local sdk_name="${ANDROID_SDK_TAG}_android"
 
         alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'
-        local build_command="$SWIFT_BUILD_COMMAND --swift-sdk $sdk_name"
+        local build_command="$SWIFT_BUILD_COMMAND --swift-sdk ${ANDROID_SDK_NAME:-$sdk_name}"
         if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then
             build_command="$build_command $SWIFT_BUILD_FLAGS"
         fi

.github/workflows/test-sdks.yml

@@ -19,11 +19,11 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Create Package
-        run: swift package init --name SwiftDemo
+        run: swift package init --name hello --type executable
       - name: Build Android
         run: |
           curl -s --retry 3 https://raw.githubusercontent.com/swift-android-sdk/github-workflows/refs/heads/android-workflow/.github/workflows/scripts/install-and-build-with-sdk.sh | \
-          bash -s -- --android --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
+          bash -s -- --android --flags="$BUILD_FLAGS" --android-sdk=aarch64-unknown-linux-android28 ${{ matrix.swift_version }}
       - name: Check Binary
         run: file .build/debug/hello