Skip to content

Commit ac96486

Browse files
authored
Merge branch 'main' into fixAccessiblePropForImage
2 parents 1e7eba1 + ff2292f commit ac96486

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

.ado/jobs/build-test-rntester.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,6 @@ jobs:
9898
steps:
9999
- template: /.ado/templates/apple-tools-setup.yml@self
100100

101-
- ${{ if in(slice.sdk, 'xros', 'xrsimulator') }}:
102-
- script: |
103-
set -eox pipefail
104-
# https://github.com/actions/runner-images/issues/10559
105-
sudo xcodebuild -runFirstLaunch
106-
sudo xcrun simctl list
107-
sudo xcodebuild -downloadPlatform visionOS
108-
sudo xcodebuild -runFirstLaunch
109-
displayName: Download visionOS SDK
110-
111101
- script: |
112102
yarn install
113103
displayName: Install npm dependencies

.ado/scripts/xcodebuild.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ if ! command -v xcbeautify 1> /dev/null; then
7070
brew install xcbeautify
7171
fi
7272

73+
xcodebuild -downloadAllPlatforms
74+
7375
eval "$build_cmd" | xcbeautify --report junit
7476

7577
if [[ "$CCACHE_DISABLE" != "1" ]]; then

.ado/templates/apple-tools-setup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: '18.x'
4+
versionSpec: '23.x'
55

66
- script: |
77
brew bundle --file .ado/Brewfile

.ado/variables/vars.yml

Lines changed: 2 additions & 2 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'
3+
xcode_friendly_name: 'Xcode 16.2'
4+
xcode_version: '/Applications/Xcode_16.2.app'
55
ios_version: '18.0'
66
ios_simulator: 'iPhone 16'

0 commit comments

Comments
 (0)