try big 2

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

Hide file tree

Showing 4 changed files with 105 additions and 100 deletions.
diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml
@@ -15,11 +15,23 @@ pr:
     exclude:
       - '*.md'
 
-jobs:
-  - template: /.ado/jobs/test-javascript.yml@self
+stages:
+  - stage: Build_And_Test
+    displayName: 'Build and Test'
+    dependsOn: []
+    jobs:
+      - template: /.ado/jobs/build-test-rntester.yml@self
 
-  - template: /.ado/jobs/test-react-native-macos-init.yml@self
+  - stage: JSOnly
+    dependsOn: []
+    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
 
-  - template: /.ado/jobs/build-test-rntester.yml@self
+  - stage: Integration
+    dependsOn: []
+    jobs:
+      - template: /.ado/jobs/test-react-native-macos-init.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,79 +2,97 @@ 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 Arch, 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 Arch, 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 Arch, Hermes'
+        sdk: iphonesimulator
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: ios_newarch_hemes
+        friendly_name: 'iOS, New Arch, Hermes'
+        sdk: iphonesimulator
+        scheme: RNTester
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: macos_oldarch_jsc 
+        friendly_name: 'macOS, Old Arch, JSC'
+        sdk: macosx
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '0'
+        use_hermes: '0'
+      - name: macos_newarch_jsc
+        friendly_name: 'macOS, New Arch, JSC'
+        sdk: macosx
+        scheme: RNTester-macOS
+        packager_platform: 'macos'
+        new_arch_enabled: '1'
+        use_hermes: '0'
+      - name: macos_oldarch_hermes
+        friendly_name: 'macOS, Old Arch, Hermes'
         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: '1'
+      - name: macos_newarch_hemes
+        friendly_name: 'macOS, New Arch, 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: visionos_oldarch_jsc 
+        friendly_name: 'visionOS, Old Arch, JSC'
         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: '0'
+        use_hermes: '0'
+      - name: visionos_newarch_jsc
+        friendly_name: 'visionOS, New Arch, JSC'
         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: '0'
+      - name: visionos_oldarch_hermes
+        friendly_name: 'visionOS, Old Arch, Hermes'
+        sdk: xrsimulator
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
+      - name: visionos_newarch_hemes
+        friendly_name: 'visionOS, New Arch, Hermes'
+        sdk: xrsimulator
+        scheme: RNTester-visionOS
+        packager_platform: 'ios'
+        new_arch_enabled: '1'
+        use_hermes: '1'
 
 jobs:
   - ${{ each slice in parameters.appleBuildMatrix }}:
       - job: ${{ slice.name }}
         displayName: ${{ slice.friendly_name }}
         pool:
-          vmImage: ${{ slice.vmImage }}
+          vmImage: $(vmImageApple)
         timeoutInMinutes: 90
         cancelTimeoutInMinutes: 5
         steps:
@@ -93,8 +111,8 @@ jobs:
               bundle install
               bundle exec pod install
           env:
-            RCT_NEW_ARCH_ENABLED: $(new_arch_enabled)
-            USE_HERMES: $(use_hermes)
+            RCT_NEW_ARCH_ENABLED: ${{ slice.new_arch_enabled }}
+            USE_HERMES: ${{ slice.use_hermes }}
 
         - task: ShellScript@2
           displayName: 'Setup packager and WebSocket test server'
@@ -110,24 +128,22 @@ jobs:
             curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=${PLATFORM}&dev=true" -o /dev/null
             curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/IntegrationTests/RCTRootViewIntegrationTestApp.bundle?platform=${PLATFORM}&dev=true" -o /dev/null
           env:
-            PLATFORM: ${{ parameters.packager_platform }}
+            PLATFORM: ${{ slice.packager_platform }}
           displayName: 'curl the packager'
 
         - template: /.ado/templates/apple-xcode-build.yml@self
           parameters:
-            xcode_sdk: ${{ parameters.xcode_sdk }}
+            xcode_sdk: ${{ slice.sdk }}
             xcode_workspacePath: packages/rn-tester/RNTesterPods.xcworkspace
-            xcode_scheme: ${{ parameters.xcode_scheme }}
+            xcode_scheme: ${{ slice.scheme }}
             xcode_actions: 'build'
-            xcode_extraArgs: ${{ parameters.xcode_extraArgs }}
 
         - template: /.ado/templates/apple-xcode-build.yml@self
           parameters:
-            xcode_sdk: ${{ parameters.xcode_sdk }}
-            xcode_workspacePath: packages/rn-tester/RNTesterPods.xcworkspace
-            xcode_scheme: ${{ parameters.xcode_scheme }}
+            xcode_sdk: ${{ slice.sdk }}
+            xcode_workspacePath: slice/rn-tester/RNTesterPods.xcworkspace
+            xcode_scheme: ${{ slice.scheme }}
             xcode_actions: 'test'
-            xcode_extraArgs: ${{ parameters.xcode_extraArgs }}
 
         - task: ShellScript@2
           displayName: 'Cleanup packager and WebSocket test server'

diff --git a/.ado/jobs/react-native-test-app-integration.yml b/.ado/jobs/react-native-test-app-integration.yml
@@ -1,28 +1,8 @@
-name: Integrate $(Date:yyyyMMdd).$(Rev:.r)
-variables:
-  - template: /.ado/variables/vars.yml@self
-trigger:
-  branches:
-    include:
-      - main
-      - '*-stable'
-  paths:
-    exclude:
-      - '*.md'
-pr:
-  branches:
-    include:
-      - main
-      - '*-stable'
-  paths:
-    exclude:
-      - '*.md'
 jobs:
   - job: react_native_test_app
     displayName: react-native-test-app
     pool:
       vmImage: $(VmImageApple)
-      demands: ['npm', 'sh', 'xcode']
     workspace:
       clean: all
     timeoutInMinutes: 60

diff --git a/.ado/templates/apple-xcode-build.yml b/.ado/templates/apple-xcode-build.yml
@@ -4,13 +4,10 @@ parameters:
   xcode_workspacePath: ''
   xcode_scheme: ''
   xcode_actions: ''
-  xcode_publishJUnitResults: false
-  xcode_extraArgs: ''
-  xcode_displayNameTags: ''
 
 steps:
   - task: CmdLine@2
     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