try big 2

microsoft · May 4, 2024 · 339db5e · 339db5e
1 parent 1cc35ff
commit 339db5e
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 66 deletions.
diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml
@@ -15,11 +15,19 @@ pr:
     exclude:
       - '*.md'
 
-jobs:
-  - template: /.ado/jobs/test-javascript.yml@self
+  stages:
+    - stage: Apple
+      jobs:
+        - template: /.ado/jobs/build-test-rntester.yml@self
 
-  - template: /.ado/jobs/test-react-native-macos-init.yml@self
+    - stage: JSOnly
+      jobs:
+        - template: /.ado/jobs/test-javascript.yml@self
 
-  - template: /.ado/jobs/npm-publish-dry-run.yml@self
+        - template: /.ado/jobs/npm-publish-dry-run.yml@self
+
+    - stage: Integration
+      jobs:
+        - template: /.ado/jobs/test-react-native-macos-init.yml@self
 
-  - template: /.ado/jobs/build-test-rntester.yml@self
+        - template: /.ado/jobs/react-native-test-app-integration.yml@self
diff --git a/.ado/jobs/build-test-rntester.yml b/.ado/jobs/build-test-rntester.yml
@@ -2,72 +2,90 @@ parameters:
   - name: appleBuildMatrix
     type: object
     default:
-      - name: iphoneos_debug
-        friendly_name: 'iOS Debug'
-        sdk: iphoneos
-        configuration: Debug
-        project_directory: 'packages/react-native-community/ios'
-        xcconfig: 'SDX_overrides_ios_device.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: iphoneos_release
-        friendly_name: 'iOS Release'
-        sdk: iphoneos
-        configuration: Release
-        project_directory: 'packages/react-native-community/ios'
-        xcconfig: 'SDX_overrides_ios_device.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: iphonesimulator_debug
-        friendly_name: 'iOS Simulator Debug'
+      - name: ios_oldarch_jsc 
+        friendly_name: 'iOS, Old Architecture, JSC'
         sdk: iphonesimulator
-        configuration: Debug
-        project_directory: 'packages/react-native-community/ios'
-        xcconfig: 'SDX__common.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: iphonesimulator_release
-        friendly_name: 'iOS Simulator Release'
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '0'
+        use_hermes: '0'
+      - name: ios_newarch_jsc
+        friendly_name: 'iOS, New Architecture, JSC'
         sdk: iphonesimulator
-        configuration: Release
-        project_directory: 'packages/react-native-community/ios'
-        xcconfig: 'SDX__common.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: macosx_debug
-        friendly_name: 'macOS Debug'
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '0'
+      - name: ios_oldarch_hermes
+        friendly_name: 'iOS, Old Architecture, Hermes'
+        sdk: iphonesimulator
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: ios_newarch_hemes
+        friendly_name: 'iOS, New Architecture, Hermes'
+        sdk: iphonesimulator
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: macos_oldarch_jsc 
+        friendly_name: 'macOS, Old Architecture, JSC'
+        sdk: macosx
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '0'
+        use_hermes: '0'
+      - name: ios_newarch_jsc
+        friendly_name: 'macOS, New Architecture, JSC'
         sdk: macosx
-        configuration: Debug
-        project_directory: 'packages/react-native-community/macos'
-        xcconfig: 'SDX_overrides_macos.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: macosx_release
-        friendly_name: 'macOS Release'
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '1'
+        use_hermes: '0'
+      - name: ios_oldarch_hermes
+        friendly_name: 'macOS, Old Architecture, Hermes'
         sdk: macosx
-        configuration: Release
-        project_directory: 'packages/react-native-community/macos'
-        xcconfig: 'SDX_overrides_macos.xcconfig'
-        vmImage: $(VmImageApple)
-      - name: visionos_debug
-        friendly_name: 'visionOS Debug'
-        sdk: xros
-        configuration: Debug
-        project_directory: 'packages/react-native-community/visionos'
-        xcconfig: 'SDX_overrides_ios_device.xcconfig'
-      - name: visionos_release
-        friendly_name: 'visionOS Release'
-        sdk: xros
-        configuration: Release
-        project_directory: 'packages/react-native-community/visionos'
-        xcconfig: 'SDX_overrides_ios_device.xcconfig'
-      - name: visionsimulator_debug
-        friendly_name: 'visionOS Simulator Debug'
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: ios_newarch_hemes
+        friendly_name: 'macOS, New Architecture, Hermes'
+        sdk: macosx
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: visionos_oldarch_jsc 
+        friendly_name: 'visionOS, Old Architecture, JSC'
+        sdk: xrsimulator
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '0'
+        use_hermes: '0'
+      - name: visionos_newarch_jsc
+        friendly_name: 'visionOS, New Architecture, JSC'
+        sdk: xrsimulator
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '0'
+      - name: visionos_oldarch_hermes
+        friendly_name: 'visionOS, Old Architecture, Hermes'
         sdk: xrsimulator
-        configuration: Debug
-        project_directory: 'packages/react-native-community/visionos'
-        xcconfig: 'SDX__common.xcconfig'
-      - name: visionsimulator_release
-        friendly_name: 'visionOS Simulator Release'
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: visionos_newarch_hemes
+        friendly_name: 'visionOS, New Architecture, Hermes'
         sdk: xrsimulator
-        configuration: Release
-        project_directory: 'packages/react-native-community/visionos'
-        xcconfig: 'SDX__common.xcconfig'
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
 
 jobs:
   - ${{ each slice in parameters.appleBuildMatrix }}:

diff --git a/.ado/templates/apple-xcode-build.yml b/.ado/templates/apple-xcode-build.yml
@@ -13,4 +13,4 @@ steps:
     displayName: Xcode ${{ parameters.xcode_actions }} ${{ parameters.xcode_configuration }} ${{ parameters.xcode_sdk }} ${{ parameters.xcode_scheme }} ${{ parameters.xcode_displayNameTags }}
     inputs:
       script: |
-        set -eox pipefail && xcodebuild -sdk ${{ parameters.xcode_sdk }} -configuration ${{ parameters.xcode_configuration }} -workspace ${{ parameters.xcode_workspacePath }} -scheme ${{ parameters.xcode_scheme }} ${{ parameters.xcode_actions }} -derivedDataPath DerivedData CODE_SIGNING_ALLOWED=no ${{ parameters.xcode_extraArgs }} | xcbeautify --report junit
+        set -eox pipefail && xcodebuild -sdk ${{ parameters.xcode_sdk }} -configuration ${{ parameters.xcode_configuration }} -workspace ${{ parameters.xcode_workspacePath }} -scheme ${{ parameters.xcode_scheme }} ${{ parameters.xcode_actions }} CODE_SIGNING_ALLOWED=no ${{ parameters.xcode_extraArgs }} | xcbeautify --report junit