Author: marcprux

.github/workflows/pull_request.yml

@@ -67,7 +67,8 @@ jobs:
           # to determine which Swift version to build for
           echo "BUILD_VERSION=${{ matrix.swift-version }}" >> $GITHUB_ENV
           echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
-          echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
+          #echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
+          echo "WORKDIR=/tmp/swift-android-sdk" >> $GITHUB_ENV
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -136,6 +137,8 @@ jobs:
           # need to free up some space or else when installing we get: No space left on device
           df -h
           rm -rf ${WORKDIR}/{build,src}
+          sudo docker image prune --all --force
+          sudo docker builder prune -a
           df -h
       - name: Install artifactbundle
         shell: bash

swift-ci/sdks/android/scripts/patch-sources.sh

@@ -21,6 +21,10 @@ fi
 cd ${source_dir}/swift-project
 swift_android_patch="${patches_dir}/swift-android.patch"
 
+ls -la swift/utils/build-script-impl
+ls -la ${swift_android_patch}
+ls -la swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
+
 # patch the patch, which seems to only be needed for an API less than 28
 # https://github.com/finagolfin/swift-android-sdk/blob/main/swift-android.patch#L110
 perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $swift_android_patch
@@ -56,9 +60,9 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
 
     echo "applying patch $patch in $PWD…"
     # first check to make sure the patches can apply and fail if not
-    patch -v --check -C1 < "$patch"
-    echo "patch --check result: $0"
-    patch -v -C1 < "$patch"
+    git apply -v --check -C1 "$patch"
+    echo "git apply --check result: $0"
+    git apply -v -C1 "$patch"
 
     #if git apply -C1 --reverse --check "$patch" >/dev/null 2>&1 ; then
     #    echo "already patched"
@@ -70,11 +74,6 @@ for patch in "$swift_android_patch" "$testing_patch" "$dispatch_patch"; do
     #fi
 done
 
-# validate the patches
-ls -la swift/utils/build-script-impl
-grep 'VALIDATING SYMBOLIC LINK' swift/utils/build-script-impl
-
-
 perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
 # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
 perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
@@ -83,3 +82,7 @@ perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' swift-testing/Sources/Test
 perl -pi -e 's;MATCHES "Android";MATCHES "AndroidDISABLED";g' llbuild/lib/llvm/Support/CMakeLists.txt
 perl -pi -e 's; STREQUAL Android\); STREQUAL AndroidDISABLED\);g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
 
+# validate the patches
+ls -la swift/utils/build-script-impl
+grep 'VALIDATING SYMBOLIC LINK' swift/utils/build-script-impl
+