Author: marcprux

.github/workflows/pull_request.yml

@@ -66,19 +66,17 @@ jobs:
       - name: "Check Patches"
         working-directory: swift-ci/sdks/android
         run: ls resources/patches/
-      - name: Build Android SDK in Docker
-        if: false
-        continue-on-error: true
-        working-directory: swift-ci/sdks/android
-        run: |
-          BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build
       - name: Install Dependencies
         run: |
           sudo apt install -q ninja-build patchelf
       - name: Build Android SDK
         working-directory: swift-ci/sdks/android
         run: |
           BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build-local
+      - name: Build Android SDK in Docker
+        working-directory: swift-ci/sdks/android
+        run: |
+          BUILD_VERSION=${{ matrix.swift-version }} TARGET_ARCHS=${{ matrix.arch }} ./build
       - name: Get artifact info
         id: info
         shell: bash

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

@@ -167,8 +167,9 @@ if ! swiftc=$(which swiftc); then
 fi
 
 script_dir=$(dirname -- "${BASH_SOURCE[0]}")
-resource_dir="${script_dir}/../resources"
-patches_dir=$(realpath "${script_dir}/../patches")
+resource_dir=$(realpath "${script_dir}/../resources")
+patches_dir="${resource_dir}/patches"
+
 ls -la ${patches_dir}
 
 # Find the version numbers of the various dependencies