From 73d586e84a1a8b8b889418b9deff35e1ee3717b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikl=C3=B3s=20Fazekas?= <mfazekas@szemafor.com>
Date: Thu, 21 Sep 2023 10:32:07 +0200
Subject: [PATCH] feat: enable new_arch build

---
 .github/workflows/android-actions.yml |  6 ++++++
 .github/workflows/ios-actions.yml     |  6 ++++++
 .github/workflows/on-push.yml         | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/.github/workflows/android-actions.yml b/.github/workflows/android-actions.yml
index f2ec081ea1..bf66f707ba 100644
--- a/.github/workflows/android-actions.yml
+++ b/.github/workflows/android-actions.yml
@@ -11,6 +11,11 @@ on:
         default: mapbox
         required: false
         type: string
+      NEW_ARCH:
+        description: "If build with new architecture or not"
+        default: false
+        required: false
+        type: boolean
     secrets:
       MAPBOX_ACCESS_TOKEN:
         required: true
@@ -54,3 +59,4 @@ jobs:
         working-directory: example/android
         env:
           CI_MAP_IMPL: ${{ inputs.MAP_IMPL }}
+          ORG_GRADLE_PROJECT_newArchEnabled: ${{ inputs.NEW_ARCH && "true" || "false" }}
diff --git a/.github/workflows/ios-actions.yml b/.github/workflows/ios-actions.yml
index 670277adb4..23fb06f18f 100644
--- a/.github/workflows/ios-actions.yml
+++ b/.github/workflows/ios-actions.yml
@@ -11,6 +11,11 @@ on:
         default: mapbox
         required: false
         type: string
+      NEW_ARCH:
+        description: "If build with new architecture or not"
+        default: false
+        required: false
+        type: boolean
     secrets:
       MAPBOX_ACCESS_TOKEN:
         required: true
@@ -73,6 +78,7 @@ jobs:
         run: cd ios && pod --version && pod update MapboxMaps && pod install
         env:
           CI_MAP_IMPL: ${{ inputs.MAP_IMPL }}
+          RCT_NEW_ARCH_ENABLED: ${{ inputs.NEW_ARCH ? 1 : 0 }}
 
       - name: Install Detox Dependencies
         run: |
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 85089c0eb5..0aeafd5efa 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -77,6 +77,20 @@ jobs:
       MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
       MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
 
+  call_android_workflow_fabric:
+    name: "Android/Mapbox/Fabric"
+    needs: [lint_test_generate,has_mapbox_token]
+    uses: ./.github/workflows/android-actions.yml
+    with:
+      NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
+      MAP_IMPL: mapbox
+      NEW_ARCH: true
+    if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
+    secrets:
+      MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+      MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
+
+
   call_android_workflow_11:
     name: "Android/Mapbox11"
     needs: [lint_test_generate,has_mapbox_token]
@@ -101,6 +115,19 @@ jobs:
       MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
       MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
 
+  call_ios_workflow_fabric:
+    name: "iOS/Mapbox/Fabric"
+    needs: [lint_test_generate,has_mapbox_token]
+    uses: ./.github/workflows/ios-actions.yml
+    if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
+    with:
+      NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
+      MAP_IMPL: mapbox
+      NEW_ARCH: true
+    secrets:
+      MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+      MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
+
   call_ios_workflow_11:
     name: "iOS/Mapbox11"
     needs: [lint_test_generate,has_mapbox_token]