Android SDK build

Author: marcprux

.github/workflows/pull_request.yml

@@ -48,12 +48,29 @@ jobs:
       - name: Build Android SDK
         working-directory: swift-ci/sdks/android
         run: |
-          sudo apt install ninja-build
+          sudo apt -q install ninja-build
           ./build
           #TARGET_ARCHS=${{ matrix.arch }} ./build
       - name: Upload SDK artifactbundle
         uses: actions/upload-artifact@v4
         with:
           compression-level: 0
           path: $RUNNER_TEMP/swift-android-sdk/products/*.artifactbundle.tar.gz
+      - name: Install SDK Locally
+        run:
+          $RUNNER_TEMP/host-toolchain/*/usr/bin/swift sdk install $RUNNER_TEMP/swift-android-sdk/products/*.artifactbundle.tar.gz
+      - name: Build Demo Project
+        run: |
+          cd $RUNNER_TEMP
+          mkdir DemoProject
+          cd DemoProject
+          $RUNNER_TEMP/host-toolchain/*/usr/bin/swift package init
+          $RUNNER_TEMP/host-toolchain/*/usr/bin/swift build --build-tests --sdk --swift-sdk aarch64-unknown-linux-android28
+      - name: Test Swift Package on Android
+        # TODO: need to implement installed-sdk option in swift-android-action
+        if: false
+        uses: skiptools/swift-android-action@main
+        with:
+          package-path: $RUNNER_TEMP/DemoProject
+          installed-sdk: aarch64-unknown-linux-android28
 

swift-ci/sdks/android/scripts/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Swift SDK for Android: Build Script
-set -ex
+set -e
 
 # Docker sets TERM to xterm if using a pty; we probably want
 # xterm-256color, otherwise we only get eight colors
@@ -37,7 +37,7 @@ function header {
 function groupstart {
     local text="$1"
     if [[ ! -z "$CI" ]]; then 
-        echo "::group::{${text}}"
+        echo "::group::${text}"
     fi
     header $text
 }

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -34,6 +34,20 @@ function header {
     echo ""
 }
 
+function groupstart {
+    local text="$1"
+    if [[ ! -z "$CI" ]]; then
+        echo "::group::${text}"
+    fi
+    header $text
+}
+
+function groupend {
+    if [[ ! -z "$CI" ]]; then
+        echo "::endgroup::"
+    fi
+}
+
 function usage {
     cat <<EOF
 usage: fetch-source.sh [--swift-scheme <scheme>|--swift-tag <tag>
@@ -120,9 +134,9 @@ fi
 cd "$source_dir"
 
 # Fetch Swift
-header "Fetching Swift"
-
 mkdir -p swift-project
+
+groupstart "Fetching Swift"
 pushd swift-project >/dev/null
 
 [[ -d swift ]] || git clone ${github}apple/swift.git
@@ -141,28 +155,28 @@ else
 fi
 
 popd >/dev/null
+groupend
 
 # Fetch libxml2
-header "Fetching libxml2"
-
+groupstart "Fetching libxml2"
 [[ -d libxml2 ]] || git clone ${github}GNOME/libxml2.git
 pushd libxml2 >/dev/null 2>&1
 git checkout v${LIBXML2_VERSION}
 popd >/dev/null 2>&1
+groupend
 
 # Fetch curl
-header "Fetching curl"
-
-[[ -d curl ]] || git clone ${github}curl/curl.git
+groupstart "Fetching curl"
 pushd curl >/dev/null 2>&1
 git checkout curl-$(echo ${CURL_VERSION} | tr '.' '_')
 popd >/dev/null 2>&1
+groupend
 
 # Fetch BoringSSL
-header "Fetching BoringSSL"
-
+groupstart "Fetching BoringSSL"
 [[ -d boringssl ]] || git clone https://boringssl.googlesource.com/boringssl
 pushd boringssl >/dev/null 2>&1
 git checkout ${BORINGSSL_VERSION}
 popd >/dev/null 2>&1
+groupend