Merge pull request #2763 from brandingbrand/fix/ENG-5789

fix: ENG-5789 - Version pin xcproj and cocoapods for CI
brandingbrand · Oct 29, 2024 · 45e72dd · 45e72dd
2 parents 146a122 + 3845727
commit 45e72dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/packages/cli/src/actions/packagers.ts b/packages/cli/src/actions/packagers.ts
@@ -96,9 +96,14 @@ export default defineAction(async (): Promise<void> => {
    */
   if (canRunIOS(config.options)) {
     try {
-      for await (const line of execa({
+      const podInstallOut = execa({
         cwd: path.project.resolve('ios'),
-      })`pod install`) {
+      })(
+        isCI ? 'bundle' : 'pod',
+        isCI ? ['exec', 'pod', 'install'] : ['install'],
+      );
+
+      for await (const line of podInstallOut) {
         logger.debug(line);
       }
 

diff --git a/packages/cli/templates/react-native-0.72/addons/ios/Gemfile b/packages/cli/templates/react-native-0.72/addons/ios/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
+# Cocoapods 1.16 requires xcodeproj 1.26.0, which is not compatible with React Native due to a bug.
+gem 'cocoapods', '~> 1.15.0'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'xcodeproj', '~> 1.25.0'
diff --git a/packages/cli/templates/react-native-0.73/addons/ios/Gemfile b/packages/cli/templates/react-native-0.73/addons/ios/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
+# Cocoapods 1.16 requires xcodeproj 1.26.0, which is not compatible with React Native due to a bug.
+gem 'cocoapods', '~> 1.15.0'
 gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'xcodeproj', '~> 1.25.0'