feat: merge 0.86-merge into 0.85-merge

.flowconfig

@@ -100,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.303.0
+^0.312.0

.github/actions/build-fantom-runner/action.yml

@@ -0,0 +1,84 @@
+name: Build Fantom Runner
+inputs:
+  release-type:
+    required: true
+    description: The type of release we are building. It could be nightly, release or dry-run
+  gradle-cache-encryption-key:
+    description: "The encryption key needed to store the Gradle Configuration cache"
+
+runs:
+  using: composite
+  steps:
+    - name: Install dependencies
+      shell: bash
+      run: |
+        sudo apt update
+        sudo apt install -y git cmake openssl libssl-dev clang
+    - name: Setup git safe folders
+      shell: bash
+      run: git config --global --add safe.directory '*'
+    - name: Setup node.js
+      uses: ./.github/actions/setup-node
+    - name: Install node dependencies
+      uses: ./.github/actions/yarn-install
+    - name: Setup gradle
+      uses: ./.github/actions/setup-gradle
+      with:
+        cache-read-only: "false"
+        cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
+    - name: Restore Fantom ccache
+      uses: actions/cache/restore@v5
+      with:
+        path: /github/home/.cache/ccache
+        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
+            'packages/react-native/ReactAndroid/**/*.cpp',
+            'packages/react-native/ReactAndroid/**/*.h',
+            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
+            'packages/react-native/ReactCommon/**/*.cpp',
+            'packages/react-native/ReactCommon/**/*.h',
+            'packages/react-native/ReactCommon/**/CMakeLists.txt',
+            'private/react-native-fantom/tester/**/*.cpp',
+            'private/react-native-fantom/tester/**/*.h',
+            'private/react-native-fantom/tester/**/CMakeLists.txt'
+          ) }}
+        restore-keys: |
+          v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-
+          v2-ccache-fantom-${{ github.job }}-
+          v2-ccache-fantom-
+    - name: Show ccache stats (before)
+      shell: bash
+      run: ccache -s -v
+    - name: Build Fantom Runner
+      shell: bash
+      run: yarn workspace @react-native/fantom build
+      env:
+        CC: clang
+        CXX: clang++
+    - name: Save Fantom ccache
+      if: ${{ github.ref == 'refs/heads/main' || contains(github.ref, '-stable') }}
+      uses: actions/cache/save@v5
+      with:
+        path: /github/home/.cache/ccache
+        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
+            'packages/react-native/ReactAndroid/**/*.cpp',
+            'packages/react-native/ReactAndroid/**/*.h',
+            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
+            'packages/react-native/ReactCommon/**/*.cpp',
+            'packages/react-native/ReactCommon/**/*.h',
+            'packages/react-native/ReactCommon/**/CMakeLists.txt',
+            'private/react-native-fantom/tester/**/*.cpp',
+            'private/react-native-fantom/tester/**/*.h',
+            'private/react-native-fantom/tester/**/CMakeLists.txt'
+          ) }}
+    - name: Show ccache stats (after)
+      shell: bash
+      run: ccache -s -v
+    - name: Copy shared libraries
+      shell: bash
+      run: cp packages/react-native/ReactAndroid/hermes-engine/build/hermes/lib/libhermesvm.so private/react-native-fantom/build/tester/
+    - name: Upload Fantom Runner binary
+      uses: actions/upload-artifact@v6
+      with:
+        name: fantom-runner-binary
+        compression-level: 1
+        path: private/react-native-fantom/build/tester/

.github/actions/maestro-android/action.yml

@@ -77,6 +77,7 @@ runs:
       if: always()
       with:
         name: e2e_android_${{ steps.normalize-app-id.outputs.app-id }}_report_${{ inputs.flavor }}_${{ inputs.emulator-arch }}_NewArch
+        overwrite: true
         path: |
           report.xml
           screen.mp4
@@ -85,4 +86,5 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: maestro-logs-android-${{ steps.normalize-app-id.outputs.app-id }}-${{ inputs.flavor }}-${{ inputs.emulator-arch }}-NewArch
+        overwrite: true
         path: /tmp/MaestroLogs

.github/actions/maestro-ios/action.yml

@@ -69,6 +69,7 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: e2e_ios_${{ inputs.app-id }}_report_${{ inputs.flavor }}_NewArch
+        overwrite: true
         path: |
           video_record_1.mov
           video_record_2.mov
@@ -81,4 +82,5 @@ runs:
       uses: actions/upload-artifact@v6
       with:
         name: maestro-logs-${{ inputs.app-id }}-${{ inputs.flavor }}-NewArch
+        overwrite: true
         path: /tmp/MaestroLogs

.github/actions/run-fantom-tests/action.yml

@@ -1,78 +1,49 @@
 name: Run Fantom Tests
-inputs:
-  release-type:
-    required: true
-    description: The type of release we are building. It could be nightly, release or dry-run
-  gradle-cache-encryption-key:
-    description: "The encryption key needed to store the Gradle Configuration cache"
-
 runs:
   using: composite
   steps:
-    - name: Install dependencies
+    - name: Install runtime dependencies
       shell: bash
       run: |
         sudo apt update
-        sudo apt install -y git cmake openssl libssl-dev clang
+        sudo apt install -y openssl libssl-dev
     - name: Setup git safe folders
       shell: bash
       run: git config --global --add safe.directory '*'
     - name: Setup node.js
       uses: ./.github/actions/setup-node
     - name: Install node dependencies
       uses: ./.github/actions/yarn-install
-    - name: Setup gradle
-      uses: ./.github/actions/setup-gradle
+    - name: Download Fantom Runner binary
+      uses: actions/download-artifact@v7
       with:
-        cache-read-only: "false"
-        cache-encryption-key: ${{ inputs.gradle-cache-encryption-key }}
-    - name: Restore Fantom ccache
-      uses: actions/cache/restore@v5
-      with:
-        path: /github/home/.cache/ccache
-        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
-            'packages/react-native/ReactAndroid/**/*.cpp',
-            'packages/react-native/ReactAndroid/**/*.h',
-            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
-            'packages/react-native/ReactCommon/**/*.cpp',
-            'packages/react-native/ReactCommon/**/*.h',
-            'packages/react-native/ReactCommon/**/CMakeLists.txt',
-            'private/react-native-fantom/tester/**/*.cpp',
-            'private/react-native-fantom/tester/**/*.h',
-            'private/react-native-fantom/tester/**/CMakeLists.txt'
-          ) }}
-        restore-keys: |
-          v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-
-          v2-ccache-fantom-${{ github.job }}-
-          v2-ccache-fantom-
-    - name: Show ccache stats
+        name: fantom-runner-binary
+        path: private/react-native-fantom/build/tester
+    - name: Make binary executable
       shell: bash
-      run: ccache -s -v
+      run: chmod +x private/react-native-fantom/build/tester/fantom_tester
     - name: Run Fantom Tests
       shell: bash
-      run: yarn fantom
+      run: |
+        for attempt in 1 2 3; do
+          echo "Attempt $attempt of 3"
+          if [ "$attempt" -eq 1 ]; then
+            if yarn fantom; then
+              exit 0
+            fi
+          else
+            if yarn fantom --onlyFailures; then
+              exit 0
+            fi
+          fi
+          if [ "$attempt" -lt 3 ]; then
+            echo "Attempt $attempt failed. Retrying only failed tests..."
+          fi
+        done
+        echo "All 3 attempts failed."
+        exit 1
       env:
-        CC: clang
-        CXX: clang++
-    - name: Save Fantom ccache
-      if: ${{ github.ref == 'refs/heads/main' || contains(github.ref, '-stable') }}
-      uses: actions/cache/save@v5
-      with:
-        path: /github/home/.cache/ccache
-        key: v2-ccache-fantom-${{ github.job }}-${{ github.ref }}-${{ hashFiles(
-            'packages/react-native/ReactAndroid/**/*.cpp',
-            'packages/react-native/ReactAndroid/**/*.h',
-            'packages/react-native/ReactAndroid/**/CMakeLists.txt',
-            'packages/react-native/ReactCommon/**/*.cpp',
-            'packages/react-native/ReactCommon/**/*.h',
-            'packages/react-native/ReactCommon/**/CMakeLists.txt',
-            'private/react-native-fantom/tester/**/*.cpp',
-            'private/react-native-fantom/tester/**/*.h',
-            'private/react-native-fantom/tester/**/CMakeLists.txt'
-          ) }}
-    - name: Show ccache stats
-      shell: bash
-      run: ccache -s -v
+        LD_LIBRARY_PATH: ${{ github.workspace }}/private/react-native-fantom/build/tester
     - name: Upload test results
       if: ${{ always() }}
       uses: actions/upload-artifact@v6

.github/scripts/resolve-hermes.mts

@@ -31,7 +31,7 @@ function setActionOutput(key: string, value: string) {
  * Reads the Hermes artifact version from
  * packages/react-native/sdks/hermes-engine/version.properties.
  *
- * Returns HERMES_V1_VERSION_NAME when RCT_HERMES_V1_ENABLED=1, otherwise
+ * [macOS] Returns HERMES_V1_VERSION_NAME unless RCT_HERMES_V1_ENABLED=0, otherwise
  * HERMES_VERSION_NAME. Returns null if the file or the key is missing.
  */
 function resolveHermesArtifactVersion(): string | null {
@@ -48,7 +48,7 @@ function resolveHermesArtifactVersion(): string | null {
       }
     }
     const key =
-      process.env.RCT_HERMES_V1_ENABLED === '1'
+      process.env.RCT_HERMES_V1_ENABLED !== '0' // [macOS]
         ? 'HERMES_V1_VERSION_NAME'
         : 'HERMES_VERSION_NAME';
     const version = props[key];
@@ -60,12 +60,12 @@ function resolveHermesArtifactVersion(): string | null {
 
 /**
  * Reads the pinned Hermes tag from packages/react-native/sdks/.hermesversion
- * (or .hermesv1version when RCT_HERMES_V1_ENABLED=1). The value is a git tag in
+ * [macOS] Uses .hermesv1version unless RCT_HERMES_V1_ENABLED=0. The value is a git tag in
  * facebook/hermes. Returns null if the file is missing or empty.
  */
 function resolveHermesTag(): string | null {
   const tagFile =
-    process.env.RCT_HERMES_V1_ENABLED === '1'
+    process.env.RCT_HERMES_V1_ENABLED !== '0' // [macOS]
       ? '.hermesv1version'
       : '.hermesversion';
   const tagPath = path.resolve(

.github/workflows/create-release.yml

@@ -28,6 +28,21 @@ jobs:
           token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
           fetch-depth: 0
           fetch-tags: 'true'
+      - name: Verify NPM token
+        run: |
+          if [[ -z "$GHA_NPM_TOKEN" ]]; then
+            echo "⚠️ No NPM token found. Skipping validation."
+            exit 0
+          fi
+          echo "//registry.npmjs.org/:_authToken=$GHA_NPM_TOKEN" > ~/.npmrc
+          if ! npm whoami > /dev/null 2>&1; then
+            echo "❌ NPM token is invalid or expired. Aborting release."
+            exit 1
+          fi
+          echo "✅ NPM token is valid ($(npm whoami))"
+          rm -f ~/.npmrc
+        env:
+          GHA_NPM_TOKEN: ${{ secrets.GHA_NPM_TOKEN }}
       - name: Check if on stable branch
         id: check_stable_branch
         run: |

.github/workflows/e2e-android-rntester.yml

@@ -0,0 +1,71 @@
+name: E2E Android RNTester
+
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      fail-on-error:
+        type: boolean
+        default: false
+    outputs:
+      status:
+        description: "The result of the E2E tests (success or failure)"
+        value: ${{ jobs.report.outputs.status }}
+
+jobs:
+  test:
+    runs-on: 4-core-ubuntu
+    outputs:
+      status: ${{ steps.report-status.outputs.status }}
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [debug, release]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Setup node.js
+        uses: ./.github/actions/setup-node
+      - name: Install node dependencies
+        uses: ./.github/actions/yarn-install
+      - name: Download APK
+        uses: actions/download-artifact@v7
+        with:
+          name: rntester-${{ matrix.flavor }}
+          path: ./packages/rn-tester/android/app/build/outputs/apk/${{ matrix.flavor }}/
+      - name: Print folder structure
+        run: ls -lR ./packages/rn-tester/android/app/build/outputs/apk/${{ matrix.flavor }}/
+      - name: Run E2E Tests
+        id: run-tests
+        continue-on-error: true
+        uses: ./.github/actions/maestro-android
+        timeout-minutes: 60
+        with:
+          app-path: ./packages/rn-tester/android/app/build/outputs/apk/${{ matrix.flavor }}/app-x86-${{ matrix.flavor }}.apk
+          app-id: com.facebook.react.uiapp
+          maestro-flow: ./packages/rn-tester/.maestro
+          flavor: ${{ matrix.flavor }}
+      - name: Report status
+        id: report-status
+        if: ${{ always() && steps.run-tests.outcome == 'failure' }}
+        run: echo "status=failure" >> $GITHUB_OUTPUT
+
+  report:
+    needs: test
+    if: always()
+    runs-on: ubuntu-latest
+    outputs:
+      status: ${{ steps.check.outputs.status }}
+    steps:
+      - id: check
+        run: |
+          if [[ "${{ needs.test.outputs.status }}" == "failure" ]]; then
+            echo "status=failure" >> $GITHUB_OUTPUT
+          else
+            echo "status=success" >> $GITHUB_OUTPUT
+          fi
+      - name: Fail if needed
+        if: ${{ inputs.fail-on-error && steps.check.outputs.status == 'failure' }}
+        run: exit 1