Merge branch 'main' into fabric/a11y-role

Author: Saadnajmi

.ado/ReactApple.nuspec

@@ -28,8 +28,10 @@ stages:
       - template: /.ado/jobs/test-javascript.yml@self
       - template: /.ado/jobs/npm-publish-dry-run.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
+  # https://github.com/microsoft/react-native-macos/issues/2344
+  # The Verdaccio server consistently hangs on creation, which is required for the integration tests
+  # - stage: Integration
+  #   dependsOn: []
+  #   jobs:
+  #     - template: /.ado/jobs/test-react-native-macos-init.yml@self
+  #     - template: /.ado/jobs/react-native-test-app-integration.yml@self

.ado/apple-pr.yml

@@ -2,90 +2,54 @@ parameters:
   - name: appleBuildMatrix
     type: object
     default:
-      - name: macos_oldarch_jsc
+      - name: macos_debug_oldarch_jsc
         friendly_name: 'macOS, Old Arch, JSC'
         sdk: macosx
+        configuration: Debug
         scheme: RNTester-macOS
         packager_platform: 'macos'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: macos_newarch_jsc
+      - name: macos_debug_newarch_jsc
         friendly_name: 'macOS, New Arch, JSC'
         sdk: macosx
+        configuration: Debug
         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
-      #   scheme: RNTester-macOS
-      #   packager_platform: 'macos'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      # - name: macos_newarch_hermes
-      #   friendly_name: 'macOS, New Arch, Hermes'
-      #   sdk: macosx
-      #   scheme: RNTester-macOS
-      #   packager_platform: 'macos'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      - name: ios_oldarch_jsc
+      - name: ios_debug_oldarch_jsc
         friendly_name: 'iOS, Old Arch, JSC'
         sdk: iphonesimulator
+        configuration: Debug
         scheme: RNTester
         packager_platform: 'ios'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: ios_newarch_jsc
+      - name: ios_debug_newarch_jsc
         friendly_name: 'iOS, New Arch, JSC'
         sdk: iphonesimulator
+        configuration: 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_hermes
-      #   friendly_name: 'iOS, New Arch, Hermes'
-      #   sdk: iphonesimulator
-      #   scheme: RNTester
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      - name: xros_oldarch_jsc
+      - name: xros_debug_oldarch_jsc
         friendly_name: 'xrOS, Old Arch, JSC'
         sdk: xrsimulator
+        configuration: Debug
         scheme: RNTester-visionOS
         packager_platform: 'ios'
         new_arch_enabled: '0'
         use_hermes: '0'
-      - name: xros_newarch_jsc
+      - name: xros_debug_newarch_jsc
         friendly_name: 'xrOS, New Arch, JSC'
         sdk: xrsimulator
+        configuration: Debug
         scheme: RNTester-visionOS
         packager_platform: 'ios'
         new_arch_enabled: '1'
         use_hermes: '0'
-      # - name: xros_oldarch_hermes
-      #   friendly_name: 'xrOS, Old Arch, Hermes'
-      #   sdk: xrsimulator
-      #   scheme: RNTester-visionOS
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
-      # - name: xros_newarch_hermes
-      #   friendly_name: 'xrOS, New Arch, Hermes'
-      #   sdk: xrsimulator
-      #   scheme: RNTester-visionOS
-      #   packager_platform: 'ios'
-      #   new_arch_enabled: '1'
-      #   use_hermes: '1'
 
 jobs:
   - ${{ each slice in parameters.appleBuildMatrix }}:
@@ -98,68 +62,23 @@ jobs:
       steps:
         - template: /.ado/templates/apple-tools-setup.yml@self
 
-        - ${{ if in(slice.sdk, 'xros', 'xrsimulator') }}:
-          - script: |
-              set -eox pipefail
-              # https://github.com/actions/runner-images/issues/10559
-              sudo xcodebuild -runFirstLaunch
-              sudo xcrun simctl list
-              sudo xcodebuild -downloadPlatform visionOS
-              sudo xcodebuild -runFirstLaunch
-            displayName: Download visionOS SDK
-
         - script: |
             yarn install
-          displayName: Install npm dependencies
-
-        - script: |
-            set -eox pipefail
-            bundle install
-            bundle exec pod install --verbose
-          env:
-            RCT_NEW_ARCH_ENABLED: ${{ slice.new_arch_enabled }}
-            USE_HERMES: ${{ slice.use_hermes }}
-          workingDirectory: packages/rn-tester
-          displayName: Install Pods
-
-        - script: |
-            set -eox pipefail
-            .ado/scripts/xcodebuild.sh packages/rn-tester/RNTesterPods.xcworkspace ${{ slice.sdk }} ${{ slice.scheme }} build
-          env:
-            CCACHE_DISABLE: 1
-          displayName: Build ${{ slice.scheme }}
-
-        # Skip testing on visionOS via the conditions below
-
-        - ${{ if ne(slice.scheme, 'RNTester-visionOS') }}:
-          - task: ShellScript@2
-            displayName: Setup packager and WebSocket test server
-            inputs:
-              scriptPath: .ado/scripts/ado-test-setup.sh
-              disableAutoCwd: true
-              cwd: ''
-
-          - script: |
-              echo Preparing the packager for platform $PLATFORM
-              curl --retry-connrefused --connect-timeout 5 --max-time 10 --retry 10 --retry-delay 5 --retry-max-time 120 "http://localhost:8081/packages/rn-tester/js/RNTesterApp.${PLATFORM}.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/packages/rn-tester/js/RNTesterApp.${PLATFORM}.bundle?platform=${PLATFORM}&dev=true&minify=false" -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/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: ${{ slice.packager_platform }}
-            displayName: Fetch JS bundles from dev server
-
-          - script: |
-              set -eox pipefail
-              .ado/scripts/xcodebuild.sh packages/rn-tester/RNTesterPods.xcworkspace ${{ slice.sdk }} ${{ slice.scheme }} test
-            env:
-              CCACHE_DISABLE: 1
-            displayName: Test ${{ slice.scheme }}
-
-          - task: ShellScript@2
-            displayName: Cleanup packager and WebSocket test server
-            inputs:
-              scriptPath: .ado/scripts/ado-test-cleanup.sh
-              disableAutoCwd: true
-              cwd: ''
-            condition: always()
+          displayName: yarn install
+        
+        - template: /.ado/templates/build-rntester-steps.yml@self
+          parameters:
+            sdk: ${{ slice.sdk }}
+            configuration: ${{ slice.configuration }}
+            scheme: ${{ slice.scheme }}
+            new_arch_enabled: ${{ slice.new_arch_enabled }}
+            use_hermes: ${{ slice.use_hermes }}
+        
+        # https://github.com/microsoft/react-native-macos/issues/2297
+        # Skip native tests as they tend to be flaky
+        # - template: /.ado/templates/test-rntester-steps.yml@self
+        #   parameters:
+        #     sdk: ${{ slice.sdk }}
+        #     configuration: ${{ slice.configuration }}
+        #     scheme: ${{ slice.scheme }}
+        #     packager_platform: ${{ slice.packager_platform }}

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

@@ -3,16 +3,8 @@ jobs:
   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
+  timeoutInMinutes: 60
+  cancelTimeoutInMinutes: 5
   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
+    - template: /.ado/templates/npm-publish-steps.yml@self
 
-    - template: /.ado/templates/apple-steps-publish.yml@self
-      parameters:
-        build_type: 'dry-run'

.ado/jobs/npm-publish-dry-run.yml

@@ -0,0 +1,19 @@
+jobs:
+- job: NPMPublish
+  displayName: NPM Publish
+  pool:
+    name: cxeiss-ubuntu-20-04-large
+    image: cxe-ubuntu-20-04-1es-pt
+    os: linux
+  variables:
+    - name: BUILDSECMON_OPT_IN
+      value: true
+  timeoutInMinutes: 90
+  cancelTimeoutInMinutes: 5
+  templateContext:
+    outputs:
+      - output: pipelineArtifact
+        targetPath: $(System.DefaultWorkingDirectory)
+        artifactName: github-npm-js-publish
+  steps:
+    - template: /.ado/templates/npm-publish-steps.yml@self