Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .ado/scripts/xcodebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ if ! command -v xcbeautify 1> /dev/null; then
brew install xcbeautify
fi

xcodebuild -downloadAllPlatforms

eval "$build_cmd" | xcbeautify --report junit

if [[ "$CCACHE_DISABLE" != "1" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/apple-tools-setup.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- task: UseNode@1
inputs:
version: '23.x'
versionSpec: '22.x'

- script: |
brew bundle --file .ado/Brewfile
Expand Down
8 changes: 4 additions & 4 deletions .ado/variables/vars.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variables:
VmImageApple: macos-latest-internal
xcode_friendly_name: 'Xcode 15.2'
xcode_version: '/Applications/Xcode_15.2.app'
ios_version: '17.2'
ios_simulator: 'iPhone 15'
xcode_friendly_name: 'Xcode 16.2'
xcode_version: '/Applications/Xcode_16.2.app'
ios_version: '18.0'
ios_simulator: 'iPhone 16'
29 changes: 16 additions & 13 deletions packages/nx-release-version/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,25 @@ const afterAllProjectsVersioned = async (cwd, opts) => {
const changedFiles = [...baseResult.changedFiles];
const deletedFiles = [...baseResult.deletedFiles];

try {
// Create the .rnm-publish file to indicate versioning has occurred
fs.writeFileSync(path.join(REPO_ROOT, '.rnm-publish'), '');
// Only update React Native artifacts if versioning actually happened
if (changedFiles.length > 0) {
try {
// Create the .rnm-publish file to indicate versioning has occurred
fs.writeFileSync(path.join(REPO_ROOT, '.rnm-publish'), '');

// Update React Native artifacts
const versionedFiles = await runSetVersion();
// Update React Native artifacts
const versionedFiles = await runSetVersion();

// Add the versioned files to changed files
changedFiles.push(...versionedFiles);
// Add the versioned files to changed files
changedFiles.push(...versionedFiles);

console.log('✅ Updated React Native artifacts');
console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file)));
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`);
throw error;
console.log('✅ Updated React Native artifacts');
console.table(versionedFiles.map(file => path.relative(REPO_ROOT, file)));
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
console.error(`❌ Failed to update React Native artifacts: ${errorMessage}`);
throw error;
}
}

return {
Expand Down
Loading