Author: marcprux

.github/workflows/pull_request.yml

@@ -37,7 +37,7 @@ jobs:
         run: ./build
 
    android-build:
-     name: Build Android ${{ matrix.swift-version }} ${{ matrix.arch }} SDK
+     name: Build Android ${{ matrix.build-type }} ${{ matrix.swift-version }} ${{ matrix.arch }} SDK
      strategy:
        fail-fast: false
        matrix:
@@ -48,6 +48,7 @@ jobs:
          # build both the quick (x86_64) and complete (aarch64,x86_64,armv7) SDKs
          arch: ['x86_64', '']
          swift-version: ['release', 'devel', 'trunk']
+         build-type: ['docker', 'local']
      runs-on: ubuntu-24.04
      steps:
       - name: Free Disk Space
@@ -67,13 +68,16 @@ jobs:
         working-directory: swift-ci/sdks/android
         run: ls resources/patches/
       - name: Install Dependencies
+        if: ${{ matrix.build-type == 'local' }}
         run: |
           sudo apt install -q ninja-build patchelf
-      - name: Build Android SDK
+      - name: Build Android SDK (Local)
+        if: ${{ matrix.build-type == 'local' }}
         working-directory: swift-ci/sdks/android
         run: |
           BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build-local
-      - name: Build Android SDK in Docker
+      - 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

swift-ci/sdks/android/build-local

@@ -69,10 +69,10 @@ fi
 
 mkdir -p ${SDKROOT}/products
 
-# Check-out the sources
-if [[ ! -d ${SDKROOT}/src ]]; then
-    scripts/fetch-source.sh --source-dir ${SDKROOT}/src --swift-tag ${SWIFT_TAG}
-fi
+./scripts/fetch-source.sh --source-dir ${SDKROOT}/src --swift-tag ${SWIFT_TAG}
+
+echo "CHECKING SOURCES: ${SDKROOT}/src"
+ls -la ${SDKROOT}/src
 
 ./scripts/build.sh --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${ANDROID_API} --host-toolchain ${HOST_TOOLCHAIN} --archs ${TARGET_ARCHS} ${@}
 

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

@@ -170,8 +170,6 @@ script_dir=$(dirname -- "${BASH_SOURCE[0]}")
 resource_dir=$(realpath "${script_dir}/../resources")
 patches_dir="${resource_dir}/patches"
 
-ls -la ${patches_dir}
-
 # Find the version numbers of the various dependencies
 function describe {
     pushd $1 >/dev/null 2>&1