Author: marcprux

.github/workflows/pull_request.yml

@@ -64,23 +64,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: "Check Patches"
-        working-directory: swift-ci/sdks/android
-        run: ls resources/patches/
-      - name: Install Dependencies
-        if: ${{ matrix.build-type == 'local' }}
-        run: |
-          sudo apt install -q ninja-build patchelf
       - name: Build Android SDK (Local)
         if: ${{ matrix.build-type == 'local' }}
         working-directory: swift-ci/sdks/android
         run: |
+          sudo apt install -q ninja-build patchelf
           BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build-local
       - name: Build Android SDK (Docker)
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android
         run: |
-          BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build
+          BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build-docker
       - name: Get artifact info
         id: info
         shell: bash

swift-ci/sdks/android/build

@@ -0,0 +1,45 @@
+#!/bin/bash -ex
+#
+# ===----------------------------------------------------------------------===
+#
+#  Swift Android SDK: Docker Container Build Script
+#
+# ===----------------------------------------------------------------------===
+
+if [[ "$DOCKER" == "" ]]; then
+    DOCKER=docker
+fi
+
+case $(arch) in
+    arm64|aarch64)
+        OS_ARCH_SUFFIX=-aarch64
+        ;;
+    amd64|x86_64)
+        OS_ARCH_SUFFIX=
+        ;;
+    *)
+        echo "Unknown architecture $(arch)"
+        exit 1
+        ;;
+esac
+
+HOST_OS=ubuntu24.04
+source ./scripts/toolchain-vars.sh
+
+ANDROID_API=28
+ANDROID_NDK_VERSION=android-ndk-r27c
+
+# Build the Docker image
+$DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_TOOLCHAIN_URL=$SWIFT_TOOLCHAIN_URL --build-arg ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION -t swift-android .
+
+# Check-out the sources
+scripts/fetch-source.sh --source-dir source --swift-tag ${SWIFT_TAG}
+
+mkdir -p products
+
+# Run the build
+$DOCKER run -it --rm \
+          -v ./source:/source \
+          -v ./products:/products \
+          swift-android \
+          /scripts/build.sh --source-dir /source --products-dir /products --android-api ${ANDROID_API} --host-toolchain /usr/local/swift --archs ${TARGET_ARCHS}

swift-ci/sdks/android/build-docker

@@ -1,5 +1,10 @@
-#!/bin/bash -e
-# Swift Android SDK: Top-level Build Script
+#!/bin/bash -ex
+#
+# ===----------------------------------------------------------------------===
+#
+#  Swift Android SDK: Local (non-Docker-containerized) Build Script
+#
+# ===----------------------------------------------------------------------===
 
 # default architectures to build for
 TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
@@ -11,38 +16,10 @@ SDKROOT=${RUNNER_TEMP:-${TMPDIR:-'/tmp'}}/swift-android-sdk
 mkdir -p ${SDKROOT}
 
 # Install a Swift host toolchain if it isn't already present
-SWIFT_ROOT=${SDKROOT}/host-toolchain
 HOST_OS=ubuntu$(lsb_release -sr)
+source ./scripts/toolchain-vars.sh
 
-#BUILD_VERSION='release'
-#BUILD_VERSION='trunk'
-#BUILD_VERSION=${BUILD_VERSION:-'devel'}
-
-case "${BUILD_VERSION}" in
-    release)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.1 | cut -d- -f2)
-        SWIFT_TAG="swift-${LATEST_TOOLCHAIN_VERSION}-RELEASE"
-        SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-release"
-        ;;
-    devel)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
-        SWIFT_TAG="swift-6.2-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
-        SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-branch"
-        ;;
-    trunk)
-        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
-        SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
-        SWIFT_BRANCH="development"
-        ;;
-    *)
-        echo "$0: invalid BUILD_VERSION=${BUILD_VERSION}"
-        exit 1
-        ;;
-esac
-
-SWIFT_BASE=$SWIFT_TAG-$HOST_OS
-SWIFT_TOOLCHAIN_URL="https://download.swift.org/$SWIFT_BRANCH/$(echo $HOST_OS | tr -d '.')/$SWIFT_TAG/$SWIFT_BASE.tar.gz"
-
+SWIFT_ROOT=${SDKROOT}/host-toolchain
 if [[ ! -d "$SWIFT_ROOT/$SWIFT_BASE" ]]; then
     mkdir -p $SWIFT_ROOT
     pushd $SWIFT_ROOT

swift-ci/sdks/android/build-local

@@ -0,0 +1,27 @@
+#!/bin/bash -e
+
+case "${BUILD_VERSION}" in
+    release)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/releases | grep -m1 swift-6.1 | cut -d- -f2)
+        SWIFT_TAG="swift-${LATEST_TOOLCHAIN_VERSION}-RELEASE"
+        SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-release"
+        ;;
+    devel)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-6.2-DEV | cut -d- -f8-10)
+        SWIFT_TAG="swift-6.2-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
+        SWIFT_BRANCH="swift-$(echo $SWIFT_TAG | cut -d- -f2)-branch"
+        ;;
+    trunk)
+        LATEST_TOOLCHAIN_VERSION=$(curl -sL https://github.com/apple/swift/tags | grep -m1 swift-DEV | cut -d- -f7-9)
+        SWIFT_TAG="swift-DEVELOPMENT-SNAPSHOT-${LATEST_TOOLCHAIN_VERSION}-a"
+        SWIFT_BRANCH="development"
+        ;;
+    *)
+        echo "$0: invalid BUILD_VERSION=${BUILD_VERSION}"
+        exit 1
+        ;;
+esac
+
+SWIFT_BASE=$SWIFT_TAG-$HOST_OS
+SWIFT_TOOLCHAIN_URL="https://download.swift.org/$SWIFT_BRANCH/$(echo $HOST_OS | tr -d '.')/$SWIFT_TAG/$SWIFT_BASE.tar.gz"
+