Author: marcprux

.github/workflows/pull_request.yml

@@ -61,11 +61,13 @@ jobs:
           sudo docker builder prune -a
           df -h
       - name: Setup
+        id: config
         run: |
           # these variabes are used by build-docker and build-local
           # to determine which Swift version to build for
           echo "BUILD_VERSION=${{ matrix.swift-version }}" >> $GITHUB_ENV
           echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
+          echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -75,12 +77,12 @@ jobs:
         working-directory: swift-ci/sdks/android
         run: |
           sudo apt install -q ninja-build patchelf
-          ./build-local
+          ./build-local ${BUILD_VERSION} ${WORKDIR}
       - name: Build Android SDK (Docker)
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android
         run: |
-          ./build-docker
+          ./build-docker ${BUILD_VERSION} ${WORKDIR}
       - name: Install Host Toolchain
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android
@@ -89,20 +91,20 @@ jobs:
           # but we need one in order to run the SDK validation tests, so we install it now
           HOST_OS=ubuntu$(lsb_release -sr)
           source ./scripts/toolchain-vars.sh
-          mkdir -p ${{ runner.temp }}/swift-android-sdk/host-toolchain
-          ./scripts/install-swift.sh ${{ runner.temp }}/swift-android-sdk/host-toolchain/$SWIFT_BASE/usr
-          ls ${{ runner.temp }}/swift-android-sdk/host-toolchain
-          ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr/bin/swift --version
+          mkdir -p ${WORKDIR}/host-toolchain
+          ./scripts/install-swift.sh ${WORKDIR}/host-toolchain/$SWIFT_BASE/usr
+          ls ${WORKDIR}/host-toolchain
+          ${WORKDIR}/host-toolchain/*/usr/bin/swift --version
       - name: Get artifact info
         id: info
         shell: bash
         run: |
           set -ex
-          SWIFT_ROOT=$(dirname ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr)
+          SWIFT_ROOT=$(dirname ${WORKDIR}/host-toolchain/*/usr)
           echo "swift-root=${SWIFT_ROOT}" >> $GITHUB_OUTPUT
           echo "swift-path=${SWIFT_ROOT}/usr/bin/swift" >> $GITHUB_OUTPUT
 
-          ARTIFACT_PATH=$(realpath ${{ runner.temp }}/swift-android-sdk/products/*.artifactbundle.tar.gz)
+          ARTIFACT_PATH=$(realpath ${WORKDIR}/products/*.artifactbundle.tar.gz)
           echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
           echo "sdk-id=x86_64-unknown-linux-android28" >> $GITHUB_OUTPUT
 
@@ -133,7 +135,7 @@ jobs:
         run: |
           # need to free up some space or else when installing we get: No space left on device
           df -h
-          rm -rf ${{ runner.temp }}/swift-android-sdk/{build,src}
+          rm -rf ${WORKDIR}/{build,src}
           df -h
       - name: Install artifactbundle
         shell: bash

swift-ci/sdks/android/README.md

@@ -2,14 +2,34 @@
 
 This is a Dockerfile-based build set-up for the Swift Android SDK.
 
-To build the Docker container and run the 
+The top-level `./build-docker` script will create a
+Docker container and install a host toolchain and the
+Android NDK, and then invoke `scripts/fetch-source.sh` which will
+fetch tagged sources for libxml2, curl, boringssl, and swift.
+
+It can be run with:
+
+```
+$ ./build-docker <version> <workdir>
+```
+
+for example:
 
 ```
-$ docker build -t swift-android .
+$ ./build-docker release /tmp/android-sdk
 ```
 
-This folder contains scripts to build a Swift Android SDK 
-in the form of an artifactbundle.
+This will create an Ubuntu 24.04 container with the necessary dependencies
+to build the Android SDK, including a Swift host toolchain and the
+Android NDK that will be used for cross-compilation.
+
+The `version` argument can be one of the following values:
+
+| version | Swift version |
+| --- | --- |
+| `release` | swift-6.1-RELEASE |
+| `devel` | swift-6.2-DEVELOPMENT-SNAPSHOT-yyyy-mm-dd |
+| `trunk` | swift-DEVELOPMENT-SNAPSHOT-yyyy-mm-dd |
 
 ## Running
 
@@ -35,7 +55,7 @@ whereas building for all the architectures takes over an hour.
 To build an artifactbundle for just the `x86_64` architecture, run:
 
 ```
-TARGET_ARCHS=aarch64 ./build-docker
+TARGET_ARCHS=aarch64 ./build-docker release /tmp/android-sdk
 ```
 
 ## Installing and validating the SDK
@@ -46,6 +66,5 @@ will create and upload an installable SDK named something like:
 
 The workflow will also install the SDK locally and use
 [swift-android-action](https://github.com/marketplace/actions/swift-android-action)
-to build and test various Swift packages in an Android emulator.
-
-
+to build and test various Swift packages in an Android emulator using the
+freshly-created SDK bundle.

swift-ci/sdks/android/build-docker

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 #
 # ===----------------------------------------------------------------------===
 #
@@ -12,9 +12,15 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
+export BUILD_VERSION=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
-WORKDIR=${RUNNER_TEMP:-${TMPDIR:-'/tmp'}}/swift-android-sdk
+WORKDIR=${2}
+if [[ "${WORKDIR}" == '' ]]; then
+    echo "Usage: $(basename $0) <release/devel/trunk> <work directory>"
+    exit 1
+fi
 mkdir -p ${WORKDIR}
+WORKDIR=$(realpath ${WORKDIR})
 
 HOST_OS=ubuntu24.04
 source ./scripts/toolchain-vars.sh

swift-ci/sdks/android/build-local

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 #
 # ===----------------------------------------------------------------------===
 #
@@ -12,16 +12,22 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
+export BUILD_VERSION=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
-WORKDIR=${RUNNER_TEMP:-${TMPDIR:-'/tmp'}}/swift-android-sdk
+WORKDIR=${1}
+if [[ "${WORKDIR}" == '' ]]; then
+    echo "Usage: $(basename $0) <release/devel/trunk> <work directory>"
+    exit 1
+fi
 mkdir -p ${WORKDIR}
+WORKDIR=$(realpath ${WORKDIR})
 
 HOST_OS=ubuntu$(lsb_release -sr)
 source ./scripts/toolchain-vars.sh
 
 SWIFT_ROOT=${WORKDIR}/host-toolchain
 HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
-if [[ ! -d "$SWIFT_ROOT/$SWIFT_BASE" ]]; then
+if [[ ! -d "$HOST_TOOLCHAIN" ]]; then
     ./scripts/install-swift.sh ${HOST_TOOLCHAIN}
 fi
 

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