Update CI to run tests across both architectures

Author: markmur

.github/actions/install-cocoapods/action.yml

@@ -17,17 +17,18 @@ runs:
       with:
         path: |
           sample/ios/Pods
-        key: ${{ runner.os }}-cocoapods-${{ hashFiles('sample/ios/Podfile.lock', 'sample/Gemfile.lock', 'sample/Gemfile', 'package.json', 'sample/package.json', 'modules/@shopify/checkout-sheet-kit/package.json', 'yarn.lock') }}
+        key: ${{ runner.os }}-cocoapods-na-${{ env.RCT_NEW_ARCH_ENABLED }}-${{ hashFiles('sample/ios/Podfile.lock', 'sample/Gemfile.lock', 'sample/Gemfile', 'package.json', 'sample/package.json', 'modules/@shopify/checkout-sheet-kit/package.json', 'yarn.lock') }}
 
     - name: Install cocoapods
       shell: bash
       env:
-        NO_FLIPPER: "1"
+        NO_FLIPPER: 1
       run: |
         set -euo pipefail
         ROOT=$(pwd)
         cd sample
         bundle install
         cd ios
-        bundle exec pod install --deployment --repo-update
+        echo "RCT_NEW_ARCH_ENABLED: ${{ env.RCT_NEW_ARCH_ENABLED }}"
+        bundle exec pod install --repo-update
         cd $ROOT

.github/workflows/ci.yml

@@ -83,10 +83,18 @@ jobs:
           create-new-comment: false
 
   test-android:
-    name: Run Android Tests
+    name: Run Android Tests (${{ matrix.arch }})
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [lint, test]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: Legacy Arch
+            new_arch_enabled: 'false'
+          - arch: New Arch
+            new_arch_enabled: 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -101,11 +109,12 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}
 
-      - name: Run Android tests
+      - name: Run Android tests (${{ matrix.arch }})
         timeout-minutes: 20
         env:
           GRADLE_OPTS: -Xmx4g -XX:MaxMetaspaceSize=768m
           JAVA_HOME: ${{ steps.setup-java.outputs.path }}
+          ORG_GRADLE_PROJECT_newArchEnabled: ${{ matrix.new_arch_enabled }}
         run: |
           echo "JAVA_HOME: $JAVA_HOME"
           java -version
@@ -115,10 +124,18 @@ jobs:
           yarn sample test:android --no-daemon
 
   test-ios:
-    name: Run Swift Tests
+    name: Run Swift Tests (${{ matrix.arch }})
     runs-on: macos-15-xlarge
     timeout-minutes: 20
     needs: [lint, test]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: legacy
+            new_arch_enabled: 'false'
+          - arch: new-arch
+            new_arch_enabled: 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -139,7 +156,11 @@ jobs:
 
       - name: Install cocoapods
         uses: ./.github/actions/install-cocoapods
+        env:
+          RCT_NEW_ARCH_ENABLED: ${{ matrix.new_arch_enabled }}
 
-      - name: Run Swift tests
+      - name: Run Swift tests (${{ matrix.arch }})
+        env:
+          RCT_NEW_ARCH_ENABLED: ${{ matrix.new_arch_enabled }}
         run: |
           yarn sample test:ios

modules/@shopify/checkout-sheet-kit/src/components/AcceleratedCheckoutButtons.tsx

@@ -304,7 +304,20 @@ export const AcceleratedCheckoutButtons: React.FC<
     }
   }
 
-  // Use legacy view manager; RN 0.80 interop bridges it under Fabric when enabled
+  /**
+   * Renderer note: Paper (old renderer) vs Fabric (new renderer).
+   *
+   * We intentionally keep supporting both:
+   * - When Fabric is enabled (RN 0.80+), the Legacy ViewManager Interop layer auto-registers
+   *   an interop component that proxies mount/prop updates/events to our existing Paper
+   *   `RCTViewManager` (`RCTAcceleratedCheckoutButtons`). No dedicated Fabric ComponentView
+   *   is required for this path to work.
+   * - When Fabric is disabled, this goes through the classic Paper UIManager path.
+   *
+   * This preserves the public API while we migrate. When we switch to a true Fabric component
+   * (codegen + `RCTViewComponentView`), we can replace this with the generated component and
+   * remove the interop/legacy manager entirely.
+   */
   const NativeComponent = LegacyAcceleratedCheckoutButtons;
 
   return (

sample/ios/Podfile

@@ -25,7 +25,7 @@ target 'ReactNative' do
     :path => config[:reactNativePath],
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/..",
-    :new_arch_enabled => true
+    :new_arch_enabled => (ENV['RCT_NEW_ARCH_ENABLED'] == '1' || ENV['RCT_NEW_ARCH_ENABLED']&.downcase == 'true')
   )
 
   target 'ReactNativeTests' do

sample/react-native.config.js

@@ -16,8 +16,5 @@ module.exports = {
     '@shopify/checkout-sheet-kit': {
       root: path.resolve(root, 'modules', '@shopify/checkout-sheet-kit'),
     },
-    ...(process.env.NO_FLIPPER
-      ? {'react-native-flipper': {platforms: {ios: null}}}
-      : {}),
   },
 };

sample/scripts/build_android

@@ -4,4 +4,4 @@ set -ex
 
 cd android
 
-./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a
+./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a -PnewArchEnabled=${ORG_GRADLE_PROJECT_newArchEnabled:-false}

sample/scripts/test_android

@@ -4,4 +4,4 @@ set -e
 
 cd android
 
-./gradlew clean generateAndroidManifestFromTemplate test --no-daemon --console=plain -Dorg.gradle.workers.max=1 -PreactNativeArchitectures=arm64-v8a
+./gradlew clean generateAndroidManifestFromTemplate test --no-daemon --console=plain -Dorg.gradle.workers.max=1 -PreactNativeArchitectures=arm64-v8a -PnewArchEnabled=${ORG_GRADLE_PROJECT_newArchEnabled:-true}