Merge branch 'main' into dependabot/npm_and_yarn/ip-1.1.9

.ado/Brewfile

@@ -1 +1,2 @@
 brew "xcbeautify"
+brew "ccache"

.ado/apple-pr.yml

@@ -2,7 +2,7 @@
 name: $(Date:yyyyMMdd).$(Rev:.r)
 
 variables:
-  - template: variables/vars.yml
+  - template: /.ado/variables/vars.yml@self
 
 trigger: none # will disable CI builds entirely
 
@@ -15,229 +15,23 @@ pr:
     exclude:
       - '*.md'
 
-jobs:
-  - job: JavaScriptPR
-    displayName: Javascript PR
-    pool:
-      vmImage: $(VmImageApple)
-      demands: ['xcode', 'sh', 'npm']
-    steps:
-      - template: templates/apple-job-javascript.yml
-        parameters:
-            slice_name: $(slice_name)
-            xcode_version: $(xcode_version)
+stages:
+  - stage: Build_And_Test
+    displayName: 'Build and Test'
+    dependsOn: []
+    jobs:
+      - template: /.ado/jobs/build-test-rntester.yml@self
 
-  - job: ApplePR
-    displayName: PR
-    strategy:
-      matrix:
-        'iOS Paper Debug JSC':
-          packager_platform: 'ios'
-          xcode_sdk: iphonesimulator
-          xcode_scheme: 'RNTester'
-          xcode_configuration: 'Debug'
-          xcode_destination: 'platform=iOS Simulator,OS=$(ios_version),name=$(ios_simulator)'
-          xcode_actions: 'build test'
-          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-          new_arch_enabled: '0'
-          use_hermes: '0'
-        'iOS Paper Release JSC':
-          packager_platform: 'ios'
-          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: '0'
-          use_hermes: '0'
-        'macOS Paper Debug JSC':
-          packager_platform: 'macos'
-          xcode_sdk: macosx
-          xcode_scheme: 'RNTester-macOS'
-          xcode_configuration: 'Debug'
-          xcode_destination: 'platform=macOS,arch=x86_64'
-          xcode_actions: 'build test'
-          xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-          new_arch_enabled: '0'
-          use_hermes: '0'
-        'macOS Paper Release JSC':
-          packager_platform: 'macos'
-          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'
-          use_hermes: '0'
-        'iOS Fabric Debug JSC':
-          packager_platform: 'ios'
-          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_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-          new_arch_enabled: '1'
-          use_hermes: '0'
-        'iOS Fabric Release JSC':
-          packager_platform: 'ios'
-          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'
-          use_hermes: '0'
-        'macOS Fabric Debug JSC':
-          packager_platform: 'macos'
-          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_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-          new_arch_enabled: '1'
-          use_hermes: '0'
-        'macOS Fabric Release JSC':
-          packager_platform: 'macos'
-          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'
-        # Disable Hermes Jobs for now
-        # 'iOS Paper Debug Hermes':
-        #   packager_platform: 'ios'
-        #   xcode_sdk: iphonesimulator
-        #   xcode_scheme: 'RNTester'
-        #   xcode_configuration: 'Debug'
-        #   xcode_destination: 'platform=iOS Simulator,OS=$(ios_version),name=$(ios_simulator)'
-        #   xcode_actions: 'build test'
-        #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-        #   new_arch_enabled: '0'
-        #   use_hermes: '1'
-        # 'iOS Paper Release Hermes':
-        #   packager_platform: 'ios'
-        #   xcode_sdk: iphonesimulator
-        #   xcode_scheme: 'RNTester'
-        #   xcode_configuration: 'Release'
-        #   xcode_destination: 'platform=iOS Simulator,OS=$(ios_version),name=$(ios_simulator)'
-        #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/release_overrides.xcconfig'
-        #   xcode_actions: 'build'
-        #   new_arch_enabled: '0'
-        #   use_hermes: '1'
-        # 'macOS Paper Debug Hermes':
-        #   packager_platform: 'macos'
-        #   xcode_sdk: macosx
-        #   xcode_scheme: 'RNTester-macOS'
-        #   xcode_configuration: 'Debug'
-        #   xcode_destination: 'platform=macOS,arch=x86_64'
-        #   xcode_actions: 'build test'
-        #   xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-        #   new_arch_enabled: '0'
-        #   use_hermes: '1'
-        # 'macOS Paper Release Hermes':
-        #   packager_platform: 'macos'
-        #   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'
-        #   use_hermes: '1'
-        # 'iOS Fabric Debug Hermes':
-        #   packager_platform: 'ios'
-        #   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_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-        #   new_arch_enabled: '1'
-        #   use_hermes: '1'
-        # 'iOS Fabric Release Hermes':
-        #   packager_platform: 'ios'
-        #   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'
-        #   use_hermes: '0'
-        # 'macOS Fabric Debug Hermes':
-        #   packager_platform: 'macos'
-        #   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_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/debug_overrides.xcconfig'
-        #   new_arch_enabled: '1'
-        #   use_hermes: '1'
-        # 'macOS Fabric Release Hermes':
-        #   packager_platform: 'macos'
-        #   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:
-      - template: templates/apple-job-react-native.yml
-        parameters:
-          packager_platform: $(packager_platform)
-          xcode_sdk: $(xcode_sdk)
-          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)
+  - stage: JSOnly
+    dependsOn: []
+    jobs:
+      - template: /.ado/jobs/test-javascript.yml@self
 
-  - job: CliInit
-    displayName: Verify react-native-macos-init
-    strategy:
-      matrix:
-        MacDebug:
-          configuration: Debug
-    pool:
-      vmImage: $(VmImageApple)
-      demands: ['xcode', 'sh', 'npm']
-    steps:
-      - template: templates/react-native-macos-init.yml
-        parameters:
-          configuration: $(configuration)
+      - template: /.ado/jobs/npm-publish-dry-run.yml@self
 
-  - job: NPMPublishDryRun
-    displayName: NPM Publish Dry Run
-    pool:
-      vmImage: $(VmImageApple)
-    timeoutInMinutes: 60 # 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:
-      - checkout: self # self represents the repo where the initial Pipelines YAML file was found
-        clean: true # whether to fetch clean each time
-        # fetchDepth: 2 # the depth of commits to ask Git to fetch
-        lfs: false # whether to download Git-LFS files
-        submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
-        persistCredentials: true # set to 'true' to leave the OAuth token in the Git config after the initial fetch
+  - stage: Integration
+    dependsOn: []
+    jobs:
+      - template: /.ado/jobs/test-react-native-macos-init.yml@self
 
-      - template: templates/apple-job-publish.yml
-        parameters:
-          build_type: 'dry-run'
+      # - template: /.ado/jobs/react-native-test-app-integration.yml@self