From d9dedb69eebe530a4f212456484a4aa3b1e55e8c Mon Sep 17 00:00:00 2001
From: NachoSoto <ignaciosoto90@gmail.com>
Date: Thu, 31 Aug 2023 11:15:13 -0700
Subject: [PATCH] WIP

---
 .circleci/config.yml                                 |  6 +-----
 .../CarthageInstallation/fastlane/Fastfile           | 12 ++++++++++++
 fastlane/Fastfile                                    |  2 +-
 fastlane/README.md                                   |  8 ++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f0cf6e31c..04ebd5ae82 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -710,12 +710,8 @@ jobs:
       - run:
           name: Carthage Update
           working_directory: Tests/InstallationTests/CarthageInstallation/
-          # install without building, then remove the tests and build, so that carthage
-          # doesn't try to build the other installation tests
           command: |
-              carthage update --no-build
-              rm -rf Carthage/Checkouts/purchases-root/Tests/InstallationTests/
-              carthage build --use-xcframeworks --verbose
+              bundle exec fastlane installation_tests
 
       - install-dependencies-scan-and-archive:
           directory: Tests/InstallationTests/CarthageInstallation/
diff --git a/Tests/InstallationTests/CarthageInstallation/fastlane/Fastfile b/Tests/InstallationTests/CarthageInstallation/fastlane/Fastfile
index 4f6eb0db44..5a49478e50 100644
--- a/Tests/InstallationTests/CarthageInstallation/fastlane/Fastfile
+++ b/Tests/InstallationTests/CarthageInstallation/fastlane/Fastfile
@@ -7,3 +7,15 @@ desc "Update carthage commit"
   backup_extension = '.bck'
   sh("sed", '-i', backup_extension, sed_regex, '../Cartfile')
 end
+
+lane :installation_tests do
+  load_spm_dependencies
+  
+  Dir.chdir("..") do
+    # install without building, then remove the tests and build, so that carthage
+    # doesn't try to build the other installation tests
+    sh "carthage", "update", "--no-build"
+    sh "rm", "-rf", "Carthage/Checkouts/purchases-root/Tests/InstallationTests/"
+    sh "carthage", "build", "--use-xcframeworks", "--verbose"
+  end
+end
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 08c3925640..bbfb5b7f24 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -837,7 +837,7 @@ lane :load_spm_dependencies do
   # This preemptively runs this command to make sure the SPM dependencies are fetched
   # without a timeout.
 
-  Dir.chdir("..") do
+  Dir.chdir("#{File.dirname(__FILE__)}/../") do
     sh("xcodebuild", "-list")
   end
 end
diff --git a/fastlane/README.md b/fastlane/README.md
index 7ef825f2cd..19e436644b 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -21,6 +21,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 
 
+### load_spm_dependencies
+
+```sh
+[bundle exec] fastlane load_spm_dependencies
+```
+
+
+
 ----