test

microsoft · Mar 29, 2024 · 52bc220 · 52bc220
1 parent a1ac18a
commit 52bc220
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 17 deletions.
diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml
@@ -56,7 +56,7 @@ jobs:
           xcode_sdk: macosx
           xcode_scheme: 'RNTester-macOS'
           xcode_configuration: 'Debug'
-          xcode_destination: 'platform=macOS,arch=x86_64'
+          xcode_destination: 'platform=macOS,arch=arm64'
           xcode_actions: 'build test'
           xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
           new_arch_enabled: '0'
@@ -66,7 +66,7 @@ jobs:
           xcode_sdk: macosx
           xcode_scheme: 'RNTester-macOS'
           xcode_configuration: 'Release'
-          xcode_destination: 'platform=macOS,arch=x86_64'
+          xcode_destination: 'platform=macOS,arch=arm64'
           xcode_actions: 'build'
           xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
           new_arch_enabled: '0'
@@ -96,8 +96,8 @@ jobs:
           xcode_sdk: macosx
           xcode_scheme: 'RNTester-macOS'
           xcode_configuration: 'Debug'
-          xcode_destination: 'platform=macOS,arch=x86_64'
-          xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
+          xcode_destination: 'platform=macOS,arch=arm64'
+          xcode_actions: 'build test'
           xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
           new_arch_enabled: '1'
           use_hermes: '0'
@@ -106,7 +106,43 @@ jobs:
           xcode_sdk: macosx
           xcode_scheme: 'RNTester-macOS'
           xcode_configuration: 'Release'
-          xcode_destination: 'platform=macOS,arch=x86_64'
+          xcode_actions: 'build'
+          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
+          new_arch_enabled: '1'
+          use_hermes: '0'
+        'visionOS Paper Debug JSC':
+          packager_platform: 'ios'
+          xcode_sdk: xros
+          xcode_scheme: 'RNTester-visionOS'
+          xcode_configuration: 'Debug'
+          xcode_actions: 'build'
+          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
+          new_arch_enabled: '0'
+          use_hermes: '0'
+        'visionOS Paper Release JSC':
+          packager_platform: 'ios'
+          xcode_sdk: xros
+          xcode_scheme: 'RNTester-visionOS'
+          xcode_configuration: 'Release'
+          xcode_actions: 'build'
+          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
+          new_arch_enabled: '0'
+          use_hermes: '0'
+        'visionOS Fabric Debug JSC':
+          packager_platform: 'ios'
+          xcode_sdk: xros
+          xcode_scheme: 'RNTester-visionOS'
+          xcode_configuration: 'Debug'
+          xcode_actions: 'build'
+          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
+          new_arch_enabled: '1'
+          use_hermes: '0'
+        'visionOS Fabric Release JSC':
+          packager_platform: 'ios'
+          xcode_sdk: xros
+          xcode_scheme: 'RNTester-visionOS'
+          xcode_configuration: 'Release'
+          xcode_destination: 'platform=macOS,arch=arm64'
           xcode_actions: 'build'
           xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
           new_arch_enabled: '1'
@@ -137,7 +173,7 @@ jobs:
         #   xcode_sdk: macosx
         #   xcode_scheme: 'RNTester-macOS'
         #   xcode_configuration: 'Debug'
-        #   xcode_destination: 'platform=macOS,arch=x86_64'
+        #   xcode_destination: 'platform=macOS,arch=arm64'
         #   xcode_actions: 'build test'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
         #   new_arch_enabled: '0'
@@ -147,7 +183,6 @@ jobs:
         #   xcode_sdk: macosx
         #   xcode_scheme: 'RNTester-macOS'
         #   xcode_configuration: 'Release'
-        #   xcode_destination: 'platform=macOS,arch=x86_64'
         #   xcode_actions: 'build'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
         #   new_arch_enabled: '0'
@@ -157,8 +192,7 @@ jobs:
         #   xcode_sdk: iphonesimulator
         #   xcode_scheme: 'RNTester'
         #   xcode_configuration: 'Debug'
-        #   xcode_destination: 'platform=iOS Simulator,OS=$(ios_version),name=$(ios_simulator)'
-        #   xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
+        #   xcode_actions: 'build test'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
         #   new_arch_enabled: '1'
         #   use_hermes: '1'
@@ -167,7 +201,6 @@ jobs:
         #   xcode_sdk: iphonesimulator
         #   xcode_scheme: 'RNTester'
         #   xcode_configuration: 'Release'
-        #   xcode_destination: 'platform=iOS Simulator,OS=$(ios_version),name=$(ios_simulator)'
         #   xcode_actions: 'build'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
         #   new_arch_enabled: '1'
@@ -177,8 +210,7 @@ jobs:
         #   xcode_sdk: macosx
         #   xcode_scheme: 'RNTester-macOS'
         #   xcode_configuration: 'Debug'
-        #   xcode_destination: 'platform=macOS,arch=x86_64'
-        #   xcode_actions: 'build' # https://github.com/facebook/react-native/issues/39719 Tests fail on RNTester with `RCT_NEW_ARCH_ENABLED`
+        #   xcode_actions: 'build test'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
         #   new_arch_enabled: '1'
         #   use_hermes: '1'
@@ -187,14 +219,12 @@ jobs:
         #   xcode_sdk: macosx
         #   xcode_scheme: 'RNTester-macOS'
         #   xcode_configuration: 'Release'
-        #   xcode_destination: 'platform=macOS,arch=x86_64'
         #   xcode_actions: 'build'
         #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
         #   new_arch_enabled: '1'
         #   use_hermes: '1'
     pool:
       vmImage: $(VmImageApple)
-      demands: ['xcode', 'sh', 'npm']
     timeoutInMinutes: 90 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
     steps:
@@ -205,7 +235,6 @@ jobs:
           xcode_configuration: $(xcode_configuration)
           xcode_scheme: $(xcode_scheme)
           xcode_actions: $(xcode_actions)
-          xcode_destination: $(xcode_destination)
           slice_name: $(slice_name)
           xcode_version: $(xcode_version)
           xcode_extraArgs: $(xcode_extraArgs)

diff --git a/.ado/templates/apple-job-react-native.yml b/.ado/templates/apple-job-react-native.yml
@@ -64,7 +64,7 @@ steps:
       teamId: '$(XCodeSigningMicrosoftTeamID)'
       args: '-destination "${{ parameters.xcode_destination }}" -verbose -derivedDataPath DerivedData ${{ parameters.xcode_extraArgs }}'
       exportPath: '$(agent.builddirectory)/output/${{ parameters.xcode_sdk }}/${{ parameters.xcode_configuration }}'
-      useXcpretty: true
+      useXcpretty: false
       publishJUnitResults: true
       xctoolReporter: 'junit:test-results.xml'
 

diff --git a/.ado/variables/vars.yml b/.ado/variables/vars.yml
@@ -1,5 +1,5 @@
 variables:
-  VmImageApple: macOS-13
+  VmImageApple: macOS-13-arm64
   slice_name: 'Xcode_15.2'
   xcode_version: '/Applications/Xcode_15.2.app'
   ios_version: '17.2'