Try running Docker build on macOS host

Author: marcprux

.github/workflows/pull_request.yml

@@ -36,6 +36,16 @@ jobs:
            #  build-type: 'docker'
            #  build-compiler: '1'
            #  runner: 'self-hosted'
+           - swift-version: 'swift-6.2-branch'
+             build-type: 'docker'
+             build-compiler: '0'
+             # Intel macOS
+             runner: 'macos-13'
+           - swift-version: 'swift-6.2-branch'
+             build-type: 'docker'
+             build-compiler: '0'
+             # ARM macOS
+             runner: 'macos-15'
            - swift-version: 'swift-6.2-branch'
              build-type: 'docker'
              build-compiler: '0'

swift-ci/sdks/android/Dockerfile

@@ -85,3 +85,4 @@ RUN groupadd -g 998 build-user && \
 USER build-user
 
 WORKDIR /home/build-user
+

swift-ci/sdks/android/build-docker

@@ -12,6 +12,9 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
+BASEPATH=$(dirname $(realpath $0))
+cd ${BASEPATH}
+
 export BUILD_SCHEME=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
 WORKDIR=${2}
@@ -27,13 +30,13 @@ source ./scripts/toolchain-vars.sh
 
 # Check-out and patch the sources
 if [[ "${BUILD_COMPILER}" != "1" ]]; then
-./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
-else
-if [[ "${BUILD_SCHEME}" == "development" ]]; then
-./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme main
+    ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-tag ${SWIFT_TAG}
 else
-./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme release/6.2
-fi
+    if [[ "${BUILD_SCHEME}" == "development" ]]; then
+        ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme main
+    else
+        ./scripts/fetch-source.sh --source-dir ${WORKDIR}/source --swift-scheme release/6.2
+    fi
 fi
 ./patches/apply-patches.sh ${WORKDIR}/source/swift-project
 
@@ -44,19 +47,6 @@ 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
-
 CONTAINER_NAME="swift-android"
 
 # Build the Docker image

swift-ci/sdks/android/build-local

@@ -12,6 +12,9 @@ TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
 
+BASEPATH=$(dirname $(realpath $0))
+cd ${BASEPATH}
+
 export BUILD_SCHEME=${1}
 # note that WORKDIR must not be under the current checkout or the patches will fail to apply
 WORKDIR=${2}

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

@@ -217,6 +217,7 @@ header "Swift Android SDK build script"
 
 swift_dir=$(realpath $(dirname "$swiftc")/..)
 HOST=linux-x86_64
+# The Linux NDK only supports x86
 #HOST=$(uname -s -m | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
 
 # in a Docker container, the pre-installed NDK is read-only,

swift-ci/sdks/android/scripts/toolchain-vars.sh

@@ -37,11 +37,26 @@ case "${BUILD_SCHEME}" in
 esac
 
 SWIFT_BASE=$SWIFT_TAG-$HOST_OS
+
+case $(arch) in
+    arm64|aarch64)
+        export OS_ARCH_SUFFIX=-aarch64
+        ;;
+    amd64|x86_64)
+        export OS_ARCH_SUFFIX=
+        ;;
+    *)
+        echo "Unknown architecture $(arch)"
+        exit 1
+        ;;
+esac
+
+
 case $BUILD_COMPILER in
     1|true|yes|YES)
-        export SWIFT_TOOLCHAIN_URL="https://download.swift.org/$RELEASE_BRANCH/$OS/$RELEASE_TAG/$RELEASE_TAG-$HOST_OS.tar.gz"
+        export SWIFT_TOOLCHAIN_URL="https://download.swift.org/$RELEASE_BRANCH/$OS$OS_ARCH_SUFFIX/$RELEASE_TAG/$RELEASE_TAG-$HOST_OS$OS_ARCH_SUFFIX.tar.gz"
         ;;
     *)
-        export SWIFT_TOOLCHAIN_URL="https://download.swift.org/$SWIFT_BRANCH/$OS/$SWIFT_TAG/$SWIFT_BASE.tar.gz"
+        export SWIFT_TOOLCHAIN_URL="https://download.swift.org/$SWIFT_BRANCH/$OS$OS_ARCH_SUFFIX/$SWIFT_TAG/$SWIFT_BASE$OS_ARCH_SUFFIX.tar.gz"
         ;;
 esac