Author: marcprux

.github/workflows/pull_request.yml

@@ -61,6 +61,9 @@ jobs:
           df -h
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+      - run: ls resources/patches/swift-android.patch
       - name: Build Android SDK in Docker
         continue-on-error: true
         working-directory: swift-ci/sdks/android

swift-ci/sdks/android/Dockerfile

@@ -18,6 +18,9 @@ ARG ZLIB_VERSION=1.3.1
 # Architecture to build on (empty means x86-64)
 ARG OS_ARCH_SUFFIX=
 
+# the branch name to use for the Swift build
+ARG SWIFT_BRANCH=
+
 # ............................................................................
 
 # Install development tools
@@ -50,7 +53,7 @@ ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069
 ARG SWIFT_PLATFORM=ubuntu
 ARG OS_MAJOR_VER=24
 ARG OS_MINOR_VER=04
-ARG SWIFT_WEBROOT=https://download.swift.org/swift-6.2-branch
+ARG SWIFT_WEBROOT=https://download.swift.org/$SWIFT_BRANCH
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -64,7 +67,6 @@ RUN chmod ugo+x /scripts/install-swift.sh
 RUN /scripts/install-swift.sh
 ENV PATH="/usr/local/swift/bin:${PATH}"
 
-
 ARG NDK_VERSION=android-ndk-r27c
 
 ENV NDK_VERSION=$NDK_VERSION

swift-ci/sdks/android/build

@@ -23,8 +23,24 @@ case $(arch) in
         ;;
 esac
 
+case "${BUILD_VERSION}" in
+    release)
+        SWIFT_BRANCH="swift-6.1-branch"
+        ;;
+    devel)
+        SWIFT_BRANCH="swift-6.2-branch"
+        ;;
+    trunk)
+        SWIFT_BRANCH="development"
+        ;;
+    *)
+        echo "Unknown build version: ${BUILD_VERSION}"
+        exit 1
+        ;;
+esac
+
 # Build the Docker image
-$DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX -t swift-android .
+$DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX --build-arg SWIFT_BRANCH=$SWIFT_BRANCH -t swift-android .
 
 # Check-out the sources
 scripts/fetch-source.sh --source-dir source

swift-ci/sdks/android/scripts/install-ndk.sh

@@ -12,9 +12,18 @@ echo "Installing Android NDK"
 
 mkdir -p /usr/local/ndk
 pushd /usr/local/ndk >/dev/null
+
 NDKFILE=${NDK_VERSION}-linux.zip
-curl -fsSL "https://dl.google.com/android/repository/${NDKFILE}" -o ${NDKFILE}
+
+NDKURL="https://dl.google.com/android/repository/${NDKFILE}"
+echo "Going to fetch ${NDKURL}"
+
+curl -fsSL "${NDKURL}" -o ${NDKFILE}
+
+echo "Extracting NDK"
 unzip -q ${NDKFILE}
+
 rm ${NDKFILE}
+
 popd >/dev/null