Update CI

Author: marcprux

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

@@ -32,8 +32,8 @@ while [[ $# -gt 0 ]]; do
             INSTALL_ANDROID=true
             shift
             ;;
-        --android-sdk=*)
-            ANDROID_SDK_NAME="${1#*=}"
+        --android-sdk-triple=*)
+            ANDROID_SDK_TRIPLE="${1#*=}"
             shift
             ;;
         --static)
@@ -569,10 +569,8 @@ install_android_sdk() {
     fi
 
     # now setup the link to the local ANDROID_NDK_HOME
-    ls ${HOME}/.config/
-    ls ${HOME}/.config/swiftpm/
-    ls ${HOME}/.config/swiftpm/swift-sdks/
-    ${HOME}/.config/swiftpm/swift-sdks/${android_sdk_bundle_dir}/swift-android/scripts/setup-android-sdk.sh
+    cd ${HOME}/.config/swiftpm
+    ./swift-sdks/${android_sdk_bundle_dir}/swift-android/scripts/setup-android-sdk.sh
 }
 
 install_static_linux_sdk() {
@@ -646,7 +644,7 @@ build() {
         #local sdk_name="${ANDROID_SDK_TAG}_android"
 
         alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'
-        local build_command="$SWIFT_BUILD_COMMAND --swift-sdk ${ANDROID_SDK_NAME:-$sdk_name}"
+        local build_command="$SWIFT_BUILD_COMMAND --swift-sdk ${ANDROID_SDK_TRIPLE:-$sdk_name}"
         if [[ -n "$SWIFT_BUILD_FLAGS" ]]; then
             build_command="$build_command $SWIFT_BUILD_FLAGS"
         fi

.github/workflows/swift_package_test.yml

@@ -115,6 +115,10 @@ on:
         type: string
         description: "Command to use when building the package with the Swift SDK for Android"
         default: "swift build"
+      android_sdk_triple:
+        type: string
+        description: "The triple to use when building with the Swift SDK for Android"
+        default: "x86_64-unknown-linux-android28"
       windows_pre_build_command:
         type: string
         description: "Windows Command Prompt command to execute before building the Swift package"
@@ -375,17 +379,17 @@ jobs:
           curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
           bash -s -- --wasm --flags="$BUILD_FLAGS" --build-command="${{ inputs.wasm_sdk_build_command }}" ${{ matrix.swift_version }}
 
-  android-sdk-build:
-    name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
-    if: ${{ inputs.enable_android_sdk_build }}
+  embedded-wasm-sdk-build:
+    name: Embedded Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
+    if: ${{ inputs.enable_embedded_wasm_sdk_build }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ${{ fromJson(inputs.android_sdk_versions) }}
+        swift_version: ${{ fromJson(inputs.wasm_sdk_versions) }}
         os_version: ${{ fromJson(inputs.linux_os_versions) }}
         exclude:
-          - ${{ fromJson(inputs.android_exclude_swift_versions) }}
+          - ${{ fromJson(inputs.wasm_exclude_swift_versions) }}
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     steps:
@@ -395,10 +399,6 @@ jobs:
         run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
-        if: ${{ matrix.os_version != 'amazonlinux2' }}
-      - name: Checkout repository
-        uses: actions/checkout@v1
-        if: ${{ matrix.os_version == 'amazonlinux2' }}
       - name: Provide token
         if: ${{ inputs.needs_token }}
         run: |
@@ -412,11 +412,11 @@ jobs:
             done
       - name: Pre-build
         run: ${{ inputs.linux_pre_build_command }}
-      - name: Install Swift SDK for Android and build
+      - name: Install Swift SDK for Wasm and build
         env:
           BUILD_FLAGS: ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
         run: |
-          ${{ inputs.android_sdk_pre_build_command }}
+          ${{ inputs.wasm_sdk_pre_build_command }}
           if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy, focal
             apt-get -q update && apt-get -yq install curl
           elif command -v dnf >/dev/null 2>&1 ; then # rhel-ubi9
@@ -430,19 +430,19 @@ jobs:
             exit 1
           fi
           curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
-          bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" ${{ matrix.swift_version }}
+          bash -s -- --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
 
-  embedded-wasm-sdk-build:
-    name: Embedded Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
-    if: ${{ inputs.enable_embedded_wasm_sdk_build }}
+  android-sdk-build:
+    name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
+    if: ${{ inputs.enable_android_sdk_build }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        swift_version: ${{ fromJson(inputs.wasm_sdk_versions) }}
+        swift_version: ${{ fromJson(inputs.android_sdk_versions) }}
         os_version: ${{ fromJson(inputs.linux_os_versions) }}
         exclude:
-          - ${{ fromJson(inputs.wasm_exclude_swift_versions) }}
+          - ${{ fromJson(inputs.android_exclude_swift_versions) }}
     container:
       image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
     steps:
@@ -452,6 +452,10 @@ jobs:
         run: clang --version
       - name: Checkout repository
         uses: actions/checkout@v4
+        if: ${{ matrix.os_version != 'amazonlinux2' }}
+      - name: Checkout repository
+        uses: actions/checkout@v1
+        if: ${{ matrix.os_version == 'amazonlinux2' }}
       - name: Provide token
         if: ${{ inputs.needs_token }}
         run: |
@@ -465,11 +469,11 @@ jobs:
             done
       - name: Pre-build
         run: ${{ inputs.linux_pre_build_command }}
-      - name: Install Swift SDK for Wasm and build
+      - name: Install Swift SDK for Android and build
         env:
           BUILD_FLAGS: ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
         run: |
-          ${{ inputs.wasm_sdk_pre_build_command }}
+          ${{ inputs.android_sdk_pre_build_command }}
           if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy, focal
             apt-get -q update && apt-get -yq install curl
           elif command -v dnf >/dev/null 2>&1 ; then # rhel-ubi9
@@ -483,7 +487,7 @@ jobs:
             exit 1
           fi
           curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
-          bash -s -- --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
+          bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-tripe="${{ inputs.android_sdk_triple }}" ${{ matrix.swift_version }}
 
   windows-build:
     name: Windows (${{ matrix.swift_version }} - windows-2022)

.github/workflows/test-sdks.yml

@@ -23,7 +23,7 @@ jobs:
       - 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" --android-sdk=aarch64-unknown-linux-android28 ${{ matrix.swift_version }}
+          bash -s -- --android --flags="$BUILD_FLAGS" --android-sdk-triple=aarch64-unknown-linux-android28 ${{ matrix.swift_version }}
       - name: Check Binary
         run: file .build/debug/hello