Author: marcprux

.github/workflows/pull_request.yml

@@ -60,6 +60,12 @@ jobs:
           sudo docker image prune --all --force
           sudo docker builder prune -a
           df -h
+      - name: Setup
+        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
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -69,12 +75,22 @@ jobs:
         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
+          ./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-docker
+          ./build-docker
+      - name: Install Host Toolchain
+        if: ${{ matrix.build-type == 'docker' }}
+        working-directory: swift-ci/sdks/android
+        run: |
+          # when building in a Docker container, we don't have a host toolchain
+          # locally, but we need one in order to run the SDK validation tests
+          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
+          ${{ runner.temp }}/swift-android-sdk/host-toolchain/swift/bin/swift --version
       - name: Get artifact info
         id: info
         shell: bash
@@ -87,7 +103,6 @@ jobs:
           echo "swift-root=${SWIFT_ROOT}" >> $GITHUB_OUTPUT
           echo "swift-path=${SWIFT_ROOT}/usr/bin/swift" >> $GITHUB_OUTPUT
 
-          #ARTIFACT_BUILD=$(realpath ${{ runner.temp }}/swift-android-sdk/build/*.artifactbundle)
           ARTIFACT_PATH=$(realpath ${{ runner.temp }}/swift-android-sdk/products/*.artifactbundle.tar.gz)
           echo "artifact-path=${ARTIFACT_PATH}" >> $GITHUB_OUTPUT
           echo "sdk-id=x86_64-unknown-linux-android28" >> $GITHUB_OUTPUT
@@ -109,9 +124,6 @@ jobs:
           # so the actual artifact download will look like:
           # swift-6.1-RELEASE_android-0.1-x86_64.artifactbundle.tar.gz.zip
           echo "artifact-name=${ARTIFACT_NAME}" >> $GITHUB_OUTPUT
-
-          # show an abridged tree
-          #tree ${ARTIFACT_BUILD} --filesfirst --prune -P 'Android.swiftmodule' -P 'libswiftAndroid.*' -P 'libFoundation.*' -P 'swiftrt.o' -P 'swift*.json' -P 'info.json' -P 'api-level.h' -P 'android.modulemap' -P 'SwiftAndroidNDK.h' -P 'bridging.modulemap' -P 'linux' -P 'libclang*.a' -P 'libunwind.a' -P 'libclang_rt.builtins-*-android.a'
       - name: Upload SDK artifactbundle
         uses: actions/upload-artifact@v4
         with:

swift-ci/sdks/android/Dockerfile

@@ -54,7 +54,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
 
 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 /usr/local/swift
 ENV PATH="/usr/local/swift/bin:${PATH}"
 
 ARG ANDROID_NDK_VERSION=

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

@@ -13,7 +13,13 @@ if [[ "${SWIFT_TOOLCHAIN_URL}" == "" ]]; then
     exit 1
 fi
 
-echo "Installing Swift from: ${SWIFT_TOOLCHAIN_URL}"
+destination=$1
+if [[ "${destination}" == "" ]]; then
+    echo "$0: Usage: $(basename $0) <swift installation directory>"
+    exit 1
+fi
+
+echo "Installing Swift from: ${SWIFT_TOOLCHAIN_URL} into: ${destination}"
 
 # Make a temporary directory
 tmpdir=$(mktemp -d)
@@ -45,9 +51,9 @@ gpg --batch --verify toolchain.sig toolchain.tar.gz
 # Extract and install the toolchain
 echo "Extracting Swift"
 
-mkdir -p /usr/local/swift
-tar -xzf toolchain.tar.gz --directory /usr/local/swift --strip-components=2
-chmod -R o+r /usr/local/swift/lib/swift
+mkdir -p ${destination}
+tar -xzf toolchain.tar.gz --directory ${destination} --strip-components=2
+chmod -R o+r ${destination}/lib/swift
 
 popd >/dev/null