From a76eb33ee348298e87279e753d93d5d18d857aba Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 4 Aug 2025 11:30:00 -0400
Subject: [PATCH 1/2] Update android.yml

---
 .github/workflows/android.yml | 43 +++++++++++------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 40eaf10b..47704db2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -19,16 +19,24 @@ on:
 jobs:
   android-build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        newArch: [true, false]
+        buildType: [Debug, Release]
+    name: Build (newArch=${{ matrix.newArch }}, buildType=${{ matrix.buildType }})
     steps:
       - uses: actions/checkout@v4
+
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
+
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
           java-version: '17'
+
       - name: Restore yarn workspaces
         id: yarn-cache
         uses: actions/cache@v3
@@ -37,39 +45,14 @@ jobs:
             node_modules
             */*/node_modules
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
       - name: Install dependencies
         run: yarn install
+
       - name: Install example app dependencies
         run: yarn install
         working-directory: example
-      - name: Build android example app with new arch disabled
-        run: ./gradlew assembleDebug -PnewArchEnabled=false
-        working-directory: example/android
-  android-build-fabric:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 20.x
-      - uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Restore yarn workspaces
-        id: yarn-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-      - name: Install dependencies
-        run: yarn install
-      - name: Install example app dependencies
-        run: yarn install
-        working-directory: example
-      - name: Build android example app with new arch enabled
-        run: ./gradlew assembleDebug -PnewArchEnabled=true
+
+      - name: Build Android example app
+        run: ./gradlew assemble${{ matrix.buildType }} -PnewArchEnabled=${{ matrix.newArch }}
         working-directory: example/android

From 9c45ee737740c1366608344880b3a3bd3b33b39b Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 4 Aug 2025 12:18:19 -0400
Subject: [PATCH 2/2] Update android.yml

---
 .github/workflows/android.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 47704db2..fd9327b8 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -20,6 +20,7 @@ jobs:
   android-build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         newArch: [true, false]
         buildType: [Debug, Release]