From 65654de7eb4e6199dc0ebb6fc5aceadac097c7c2 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Fri, 1 Jul 2022 07:39:01 +0300
Subject: [PATCH] chore: sdk-ffi apple - try building the framework on x86_64
 outside of Xcode

---
 .github/workflows/bindings_ci.yml                              | 3 +++
 .../xcshareddata/xcschemes/MatrixRustSDK.xcscheme              | 2 +-
 bindings/apple/debug_build_xcframework.sh                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bindings_ci.yml b/.github/workflows/bindings_ci.yml
index 1768109a7..0798ef17c 100644
--- a/.github/workflows/bindings_ci.yml
+++ b/.github/workflows/bindings_ci.yml
@@ -161,6 +161,9 @@ jobs:
           # keep in sync with uniffi dependency in Cargo.toml's
           args: uniffi_bindgen --version ^0.18
 
+      - name: Generate .xcframework
+        run: sh bindings/apple/debug_build_xcframework.sh x86_64 ci
+
       - name: Run XCTests
         run: |
           xcodebuild test \
diff --git a/bindings/apple/MatrixRustSDK.xcodeproj/xcshareddata/xcschemes/MatrixRustSDK.xcscheme b/bindings/apple/MatrixRustSDK.xcodeproj/xcshareddata/xcschemes/MatrixRustSDK.xcscheme
index 9d3179964..fe527d24f 100644
--- a/bindings/apple/MatrixRustSDK.xcodeproj/xcshareddata/xcschemes/MatrixRustSDK.xcscheme
+++ b/bindings/apple/MatrixRustSDK.xcodeproj/xcshareddata/xcschemes/MatrixRustSDK.xcscheme
@@ -10,7 +10,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "PATH=~/.cargo/bin:${PATH}&#10;echo $ARCHS&#10;sh $PROJECT_DIR/debug_build_xcframework.sh &quot;$ARCHS&quot; CI&#10;">
+               scriptText = "#PATH=~/.cargo/bin:${PATH}&#10;echo $ARCHS&#10;#sh $PROJECT_DIR/debug_build_xcframework.sh &quot;$ARCHS&quot; CI&#10;">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"
diff --git a/bindings/apple/debug_build_xcframework.sh b/bindings/apple/debug_build_xcframework.sh
index 10d7e0731..60625dd03 100755
--- a/bindings/apple/debug_build_xcframework.sh
+++ b/bindings/apple/debug_build_xcframework.sh
@@ -10,7 +10,7 @@ if [ $# -eq 2 ]; then
   echo "Running CI build"
   IS_CI=true
   ARCHS=( $1 )
-  ACTIVE_ARCH=${ARCHS[1]}
+  ACTIVE_ARCH=${ARCHS[0]}
 elif [ $# -eq 1 ]; then
   echo "Running debug build"
   ARCHS=( $1 )