Author: marcprux

swift-ci/sdks/android/Dockerfile

@@ -18,8 +18,8 @@ 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=
+# the Swift toolchain URL to download
+ARG SWIFT_TOOLCHAIN_URL=
 
 # ............................................................................
 
@@ -53,18 +53,16 @@ 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_BRANCH
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     OS_MAJOR_VER=$OS_MAJOR_VER \
     OS_MINOR_VER=$OS_MINOR_VER \
-    OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER.$OS_MINOR_VER \
-    SWIFT_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_MINOR_VER$OS_ARCH_SUFFIX"
+    OS_VER=$SWIFT_PLATFORM$OS_MAJOR_VER.$OS_MINOR_VER
 
 COPY scripts/install-swift.sh /scripts/install-swift.sh
 RUN chmod ugo+x /scripts/install-swift.sh
-RUN /scripts/install-swift.sh
+RUN /scripts/install-swift.sh "${SWIFT_TOOLCHAIN_URL}"
 ENV PATH="/usr/local/swift/bin:${PATH}"
 
 ARG ANDROID_NDK_VERSION=android-ndk-r27c

swift-ci/sdks/android/build

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 #
 # ===----------------------------------------------------------------------===
 #
@@ -45,11 +45,16 @@ case "${BUILD_VERSION}" in
         ;;
 esac
 
+# FIXME: this is the host operating system, but we need the Docker OS
+HOST_OS=ubuntu24.04
+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"
+
 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_BRANCH=$SWIFT_BRANCH --build-arg ANDROID_NDK_VERSION=$ANDROID_NDK_VERSION -t swift-android .
+$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}

swift-ci/sdks/android/build-local

@@ -41,13 +41,13 @@ case "${BUILD_VERSION}" in
 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"
 
 if [[ ! -d "$SWIFT_ROOT/$SWIFT_BASE" ]]; then
     mkdir -p $SWIFT_ROOT
     pushd $SWIFT_ROOT
 
-    SWIFT_URL="https://download.swift.org/$SWIFT_BRANCH/$(echo $HOST_OS | tr -d '.')/$SWIFT_TAG/$SWIFT_BASE.tar.gz"
-    wget -q $SWIFT_URL
+    wget -q $SWIFT_TOOLCHAIN_URL
     tar xzf $SWIFT_BASE.tar.gz
 
     popd

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

@@ -256,16 +256,13 @@ quiet_pushd ${source_dir}/swift-project
     for patch in "$swift_android_patch" "$testing_patch"; do
         echo "applying patch $patch in $PWD…"
 
-        if git apply --reverse --check "$patch" >/dev/null 2>&1 ; then
+        if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
             echo "already patched"
-        elif git apply "$patch" ; then
+        elif git apply -C1 "$patch" ; then
             echo "done"
         else
             echo "failed to apply patch $patch in $PWD"
-            # tolerate failed patches in trunk for now
-            if [[ "${BUILD_VERSION}" != 'trunk' ]]; then
-                exit 1
-            fi
+            exit 1
         fi
     done
 

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

@@ -8,15 +8,8 @@
 
 set -e
 
-echo "Installing Swift"
-
-# Get latest toolchain info
-latest_build=$(curl -s ${SWIFT_WEBROOT}/latest-build.yml)
-download=$(echo "$latest_build" | grep '^download: ' | sed 's/^download: //g')
-download_signature=$(echo "$latest_build " | grep '^download_signature: ' | sed 's/^download_signature: //g')
-download_dir=$(echo "$latest_build" | grep '^dir: ' | sed 's/^dir: //g')
-
-echo "Latest build is ${download_dir}"
+SWIFT_TOOLCHAIN_URL=$1
+echo "Installing Swift from: ${SWIFT_TOOLCHAIN_URL}"
 
 # Make a temporary directory
 tmpdir=$(mktemp -d)
@@ -29,13 +22,13 @@ pushd "$tmpdir" >/dev/null
 export GNUPGHOME="$tmpdir"
 
 # Fetch the toolchain and signature
-echo "Going to fetch ${SWIFT_WEBROOT}/${download_dir}/${download}"
+echo "Going to fetch ${SWIFT_TOOLCHAIN_URL}"
 
-curl -fsSL "${SWIFT_WEBROOT}/${download_dir}/${download}" -o toolchain.tar.gz
+curl -fsSL "${SWIFT_TOOLCHAIN_URL}" -o toolchain.tar.gz
 
-echo "Going to fetch ${SWIFT_WEBROOT}/${download_dir}/${download_signature}"
+echo "Going to fetch ${SWIFT_TOOLCHAIN_URL}.sig"
 
-curl -fsSL "${SWIFT_WEBROOT}/${download_dir}/${download_signature}" -o toolchain.sig
+curl -fsSL "${SWIFT_TOOLCHAIN_URL}.sig" -o toolchain.sig
 
 echo "Fetching keys"