From 4334f8c9c9e31f92ddfe94f5aaddc6e91432d16d Mon Sep 17 00:00:00 2001
From: Conrad Kramer <conrad@conradkramer.com>
Date: Sat, 16 Mar 2024 10:34:59 -0700
Subject: [PATCH] Configure CARGO_TARGET_DIR to be inside of DerivedData

---
 .github/actions/build-for-testing/action.yml   | 10 ++++++----
 .github/actions/export/action.yml              |  3 +++
 Apple/NetworkExtension/libburrow/build-rust.sh |  8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/actions/build-for-testing/action.yml b/.github/actions/build-for-testing/action.yml
index ce91b43..2c66963 100644
--- a/.github/actions/build-for-testing/action.yml
+++ b/.github/actions/build-for-testing/action.yml
@@ -24,6 +24,7 @@ runs:
       path: |
         Apple/PackageCache
         Apple/SourcePackages
+        Apple/DerivedData
       key: ${{ runner.os }}-${{ inputs.scheme }}-${{ hashFiles('**/Package.resolved') }}
       restore-keys: |
         ${{ runner.os }}-${{ inputs.scheme }}-
@@ -33,17 +34,18 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      xcodebuild clean build-for-testing \
+      xcodebuild build-for-testing \
         -allowProvisioningUpdates \
         -allowProvisioningDeviceRegistration \
+        -skipPackagePluginValidation \
+        -skipMacroValidation \
+        -onlyUsePackageVersionsFromResolvedFile \
         -authenticationKeyID ${{ inputs.app-store-key-id }} \
         -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
         -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
-        -onlyUsePackageVersionsFromResolvedFile \
         -clonedSourcePackagesDirPath SourcePackages \
         -packageCachePath $PWD/PackageCache \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
+        -derivedDataPath $PWD/DerivedData \
         -scheme '${{ inputs.scheme }}' \
         -destination '${{ inputs.destination }}' \
         -resultBundlePath BuildResults.xcresult
diff --git a/.github/actions/export/action.yml b/.github/actions/export/action.yml
index bf007a7..635732c 100644
--- a/.github/actions/export/action.yml
+++ b/.github/actions/export/action.yml
@@ -37,6 +37,9 @@ runs:
         -exportArchive \
         -allowProvisioningUpdates \
         -allowProvisioningDeviceRegistration \
+        -skipPackagePluginValidation \
+        -skipMacroValidation \
+        -onlyUsePackageVersionsFromResolvedFile \
         -authenticationKeyID ${{ inputs.app-store-key-id }} \
         -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
         -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
diff --git a/Apple/NetworkExtension/libburrow/build-rust.sh b/Apple/NetworkExtension/libburrow/build-rust.sh
index 1ac73fb..fffa0d0 100755
--- a/Apple/NetworkExtension/libburrow/build-rust.sh
+++ b/Apple/NetworkExtension/libburrow/build-rust.sh
@@ -56,10 +56,10 @@ CARGO_ARGS+=("--lib")
 
 # Pass the configuration (Debug or Release) through to cargo
 if [[ $SWIFT_ACTIVE_COMPILATION_CONDITIONS == *DEBUG* ]]; then
-    CARGO_DIR="debug"
+    CARGO_TARGET_SUBDIR="debug"
 else
     CARGO_ARGS+=("--release")
-    CARGO_DIR="release"
+    CARGO_TARGET_SUBDIR="release"
 fi
 
 if [[ -x "$(command -v rustup)" ]]; then
@@ -70,11 +70,11 @@ fi
 
 # Run cargo without the various environment variables set by Xcode.
 # Those variables can confuse cargo and the build scripts it runs.
-env -i PATH="$CARGO_PATH" cargo build "${CARGO_ARGS[@]}"
+env -i PATH="$CARGO_PATH" CARGO_TARGET_DIR="${CONFIGURATION_TEMP_DIR}/target" cargo build "${CARGO_ARGS[@]}"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}"
 
 # Use `lipo` to merge the architectures together into BUILT_PRODUCTS_DIR
 /usr/bin/xcrun --sdk $PLATFORM_NAME lipo \
-    -create $(printf "${PROJECT_DIR}/../target/%q/${CARGO_DIR}/libburrow.a " "${RUST_TARGETS[@]}") \
+    -create $(printf "${CONFIGURATION_TEMP_DIR}/target/%q/${CARGO_TARGET_SUBDIR}/libburrow.a " "${RUST_TARGETS[@]}") \
     -output "${BUILT_PRODUCTS_DIR}/libburrow.a"