From f1cfe4ef78ceba85ec6ab4c0dd7f58bcbc0c9324 Mon Sep 17 00:00:00 2001
From: Riccardo Cipolleschi <cipolleschi@meta.com>
Date: Mon, 10 Nov 2025 18:06:06 +0000
Subject: [PATCH] [RN][iOS][CI] Restore testing with Cocoapods and
 use_frameworks

---
 .github/actions/test-ios-rntester/action.yml | 22 +++++++++++++-------
 .github/workflows/test-all.yml               | 20 ++++++++++++++++--
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/actions/test-ios-rntester/action.yml b/.github/actions/test-ios-rntester/action.yml
index d014e428699d..1f9d3c49e63d 100644
--- a/.github/actions/test-ios-rntester/action.yml
+++ b/.github/actions/test-ios-rntester/action.yml
@@ -1,9 +1,6 @@
 name: test-ios-rntester
 description: Test iOS RNTester
 inputs:
-  use-frameworks:
-    description: The dependency building and linking strategy to use. Must be one of "StaticLibraries", "DynamicFrameworks"
-    default: StaticLibraries
   ruby-version:
     description: The version of ruby that must be used
     default: 2.6.10
@@ -17,6 +14,10 @@ inputs:
     description: Whether we want to run E2E tests or not
     required: false
     default: false
+  use-frameworks:
+    description: Whether we have to build with Dynamic Frameworks. If this is set to true, it builds from source
+    required: false
+    default: false
 
 runs:
   using: composite
@@ -43,29 +44,34 @@ runs:
       if: ${{ inputs.run-unit-tests == 'true' }}
       uses: ./.github/actions/prepare-ios-tests
     - name: Download ReactNativeDependencies
+      if: ${{ inputs.use-frameworks == 'false' }}
       uses: actions/download-artifact@v4
       with:
         name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/third-party/
     - name: Print third-party folder
+      if: ${{ inputs.use-frameworks == 'false' }}
       shell: bash
       run: ls -lR /tmp/third-party
     - name: Download React Native Prebuilds
+      if: ${{ inputs.use-frameworks == 'false' }}
       uses: actions/download-artifact@v4
       with:
         name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/ReactCore
     - name: Print ReactCore folder
+      if: ${{ inputs.use-frameworks == 'false' }}
       shell: bash
       run: ls -lR /tmp/ReactCore
     - name: Install CocoaPods dependencies
       shell: bash
       run: |
-        export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
-        export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
-
-        if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
+        if [[ ${{ inputs.use-frameworks }} == "true" ]]; then
           export USE_FRAMEWORKS=dynamic
+        else
+          # If use-frameworks is false, let's use prebuilds
+          export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
+          export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
         fi
 
         cd packages/rn-tester
@@ -108,7 +114,7 @@ runs:
         name: xcresults
         path: /Users/distiller/Library/Developer/Xcode/xcresults.tar.gz
     - name: Upload RNTester App
-      if: ${{ inputs.use-frameworks == 'StaticLibraries' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
+      if: ${{ inputs.use-frameworks == 'false' && inputs.ruby-version == '2.6.10' }} # This is needed to avoid conflicts with the artifacts
       uses: actions/upload-artifact@v4.3.4
       with:
         name: RNTesterApp-NewArch-${{ inputs.flavor }}
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
index 7114dbef8298..d3091bdb8064 100644
--- a/.github/workflows/test-all.yml
+++ b/.github/workflows/test-all.yml
@@ -58,6 +58,22 @@ jobs:
           ruby-version: "3.2.0"
           flavor: Debug
 
+  test_ios_rntester_dynamic_frameworks:
+    runs-on: macos-15-large
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [Debug, Release]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run it
+        uses: ./.github/actions/test-ios-rntester
+        with:
+          flavor: Debug
+          use-frameworks: true
+
+
   test_ios_rntester:
     runs-on: macos-15-large
     needs:
@@ -67,7 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         flavor: [Debug, Release]
-        frameworks: [StaticLibraries, DynamicFrameworks]
+        frameworks: [false, true]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -441,7 +457,7 @@ jobs:
     strategy:
       matrix:
         flavor: [Debug, Release]
-        use_frameworks: [StaticLibraries, DynamicFrameworks]
+        use_frameworks: [false, true]
         exclude:
           # This config is tested with Ruby 3.2.0. Let's not double test it.
           - flavor: Debug