ci: Downgrade to Xcode 15, don't run pod install with `react-native…

…-macos-init` (#2271) * Revert "chore(ci): Update to Xcode 16 (#2207)" This reverts commit 9bf6051. * Update generate-macos.js * Update index.js * Update test-react-native-macos-init.yml * Update index.js
microsoft · Nov 13, 2024 · ffd6abb · ffd6abb
1 parent d61d747
commit ffd6abb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/.ado/jobs/test-react-native-macos-init.yml b/.ado/jobs/test-react-native-macos-init.yml
@@ -38,6 +38,7 @@ jobs:
           # We need to set the npm registry here otherwise it won't stick
           $(Build.Repository.LocalPath)/.ado/scripts/verdaccio.sh configure
           node $(Build.Repository.LocalPath)/packages/react-native-macos-init/bin.js --verbose --version latest --overwrite --prerelease
+          pod install --project-directory=macos
         workingDirectory: $(Agent.BuildDirectory)/testcli
         displayName: Apply macOS template (new project)
 

diff --git a/.ado/variables/vars.yml b/.ado/variables/vars.yml
@@ -1,6 +1,6 @@
 variables:
   VmImageApple: macos-latest-internal
-  xcode_friendly_name: 'Xcode 16.0'
-  xcode_version: '/Applications/Xcode_16.0.app'
-  ios_version: '18.0'
-  ios_simulator: 'iPhone 16'
+  xcode_friendly_name: 'Xcode 15.2'
+  xcode_version: '/Applications/Xcode_15.2.app'
+  ios_version: '17.2'
+  ios_simulator: 'iPhone 15'
diff --git a/packages/react-native/local-cli/generate-macos.js b/packages/react-native/local-cli/generate-macos.js
@@ -30,8 +30,6 @@ function generateMacOS (projectDir, name, options) {
     { overwrite: options.overwrite }
   );
 
-  installPods(options);
-
   printFinishMessage(name);
 }
 

diff --git a/packages/react-native/local-cli/generator-macos/index.js b/packages/react-native/local-cli/generator-macos/index.js
@@ -122,32 +122,20 @@ function installDependencies(options) {
   childProcess.execSync(isYarn ? 'yarn' : 'npm i', execOptions);
 }
 
-/**
- * @param {{ verbose?: boolean }=} options
- */
-function installPods(options) {
-  const cwd = path.join(process.cwd(), macOSDir);
-  const quietFlag = options && options.verbose ? '' : '--quiet';
-  childProcess.execSync(`npx ${quietFlag} pod-install --non-interactive ${quietFlag}`, { stdio: 'inherit', cwd });
-}
-
 /**
  * @param {string} newProjectName
  */
 function printFinishMessage(newProjectName) {
   console.log(`
   ${chalk.blue(`Run instructions for ${chalk.bold('macOS')}`)}:
+    • pod install --project-directory=macos
     • npx react-native run-macos
-    ${chalk.dim('- or -')}
-    • Open ${xcworkspacePath(newProjectName)} in Xcode or run "xed -b ${macOSDir}"
     • yarn start:macos
-    • Hit the Run button
 `);
 }
 
 module.exports = {
   copyProjectTemplateAndReplace,
   installDependencies,
-  installPods,
   printFinishMessage,
 };