From c7f6d5df25a73334729342d68093c6520e631514 Mon Sep 17 00:00:00 2001
From: Walid Kayhal <3347810+waliid@users.noreply.github.com>
Date: Mon, 4 Nov 2024 11:56:01 +0100
Subject: [PATCH] Try another workflow

---
 .github/workflows/ci.yml | 14 +++-----------
 fastlane/Fastfile        |  3 ---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f67ddd50..0a48b42e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,16 +75,8 @@ jobs:
         run: |
           ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-streams-start"
 
-  resolve-spm-dependencies:
-    needs: [install-tools, cache-management, run-streams, setup-project]
-    runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
-    steps:
-      - name: Resolve SPM dependencies
-        run: |
-          ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && swift package resolve"
-
   test-ios:
-    needs: [install-tools, resolve-spm-dependencies]
+    needs: [install-tools, cache-management, run-streams, setup-project]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
     steps:
       - name: Run the iOS tests
@@ -92,7 +84,7 @@ jobs:
           ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-ios"
 
   test-tvos:
-    needs: [install-tools, resolve-spm-dependencies]
+    needs: [install-tools, test-ios]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
     steps:
       - name: Run the tvOS tests
@@ -100,7 +92,7 @@ jobs:
           ~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-tvos"
 
   archive-demo-ios:
-    needs: [install-tools, test-ios]
+    needs: [install-tools, test-tvos]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
     steps:
       - name: Archive the iOS demo
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a67a6a40..d76e47f3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -194,16 +194,13 @@ end
 
 def run_package_tests(platform_id, scheme_name)
   output_path = "fastlane/test_output_#{platform_id}"
-  derived_data_path = "#{Dir.home}/Library/Developer/Xcode/DerivedData/#{platform_id}"
   FileUtils.mkdir_p(output_path)
-  FileUtils.mkdir_p(derived_data_path)
   run_tests(
     scheme: scheme_name,
     device: DEVICES[platform_id],
     package_path: '.',
     result_bundle: true,
     output_directory: output_path,
-    derived_data_path: derived_data_path,
     number_of_retries: 3,
     fail_build: false,
     xcargs: '-testLanguage en -testRegion en_US'