Skip to content

Commit ffd6abb

Browse files
authored
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
1 parent d61d747 commit ffd6abb

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

.ado/jobs/test-react-native-macos-init.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
# We need to set the npm registry here otherwise it won't stick
3939
$(Build.Repository.LocalPath)/.ado/scripts/verdaccio.sh configure
4040
node $(Build.Repository.LocalPath)/packages/react-native-macos-init/bin.js --verbose --version latest --overwrite --prerelease
41+
pod install --project-directory=macos
4142
workingDirectory: $(Agent.BuildDirectory)/testcli
4243
displayName: Apply macOS template (new project)
4344

.ado/variables/vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
VmImageApple: macos-latest-internal
3-
xcode_friendly_name: 'Xcode 16.0'
4-
xcode_version: '/Applications/Xcode_16.0.app'
5-
ios_version: '18.0'
6-
ios_simulator: 'iPhone 16'
3+
xcode_friendly_name: 'Xcode 15.2'
4+
xcode_version: '/Applications/Xcode_15.2.app'
5+
ios_version: '17.2'
6+
ios_simulator: 'iPhone 15'

packages/react-native/local-cli/generate-macos.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ function generateMacOS (projectDir, name, options) {
3030
{ overwrite: options.overwrite }
3131
);
3232

33-
installPods(options);
34-
3533
printFinishMessage(name);
3634
}
3735

packages/react-native/local-cli/generator-macos/index.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,32 +122,20 @@ function installDependencies(options) {
122122
childProcess.execSync(isYarn ? 'yarn' : 'npm i', execOptions);
123123
}
124124

125-
/**
126-
* @param {{ verbose?: boolean }=} options
127-
*/
128-
function installPods(options) {
129-
const cwd = path.join(process.cwd(), macOSDir);
130-
const quietFlag = options && options.verbose ? '' : '--quiet';
131-
childProcess.execSync(`npx ${quietFlag} pod-install --non-interactive ${quietFlag}`, { stdio: 'inherit', cwd });
132-
}
133-
134125
/**
135126
* @param {string} newProjectName
136127
*/
137128
function printFinishMessage(newProjectName) {
138129
console.log(`
139130
${chalk.blue(`Run instructions for ${chalk.bold('macOS')}`)}:
131+
• pod install --project-directory=macos
140132
• npx react-native run-macos
141-
${chalk.dim('- or -')}
142-
• Open ${xcworkspacePath(newProjectName)} in Xcode or run "xed -b ${macOSDir}"
143133
• yarn start:macos
144-
• Hit the Run button
145134
`);
146135
}
147136

148137
module.exports = {
149138
copyProjectTemplateAndReplace,
150139
installDependencies,
151-
installPods,
152140
printFinishMessage,
153141
};

0 commit comments

Comments
 (0)