Merge pull request #329 from patrickkabwe/chore/ci-refactor-templates-android-ios-20250829-211326

chore(ci): refactor template android/ios workflows

Author: patrickkabwe

assets/template/.github/workflows/android-build.yml

@@ -1,5 +1,8 @@
 name: Build Android
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -25,63 +28,52 @@ on:
       - '**/bun.lock'
       - '**/react-native.config.js'
       - '**/nitro.json'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  build_new:
-    name: Build Android Example App (new architecture)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-
-      - name: Install npm dependencies (bun)
-        run: bun install
-
-      - name: Setup JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 17
-          java-package: jdk
-          cache: gradle
-
-      - name: Run Gradle Build for example/android/
-        working-directory: example/android
-        run: ./gradlew assembleDebug --no-daemon --build-cache
-
-      - name: Stop Gradle Daemon
-        working-directory: example/android
-        run: ./gradlew --stop
-
-  build_old:
-    name: Build Android Example App (old architecture)
+  build:
+    name: Build Android Example App (${{ matrix.arch }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [new, old]
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
 
-      - name: Install npm dependencies (bun)
+      - name: Install dependencies (bun)
         run: bun install
 
       - name: Disable new architecture in gradle.properties
+        if: matrix.arch == 'old'
         run: sed -i "s/newArchEnabled=true/newArchEnabled=false/g" example/android/gradle.properties
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
-          java-version: 17
-          java-package: jdk
-          cache: gradle
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
-      - name: Run Gradle Build for example/android/
+      - name: Run Gradle build
         working-directory: example/android
         run: ./gradlew assembleDebug --no-daemon --build-cache
 
-      - name: Stop Gradle Daemon
+      - name: Stop Gradle daemon
         working-directory: example/android
         run: ./gradlew --stop

assets/template/.github/workflows/ios-build.yml

@@ -1,5 +1,8 @@
 name: Build iOS
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
@@ -33,6 +36,7 @@ on:
       - '**/*.podspec'
       - '**/react-native.config.js'
       - '**/nitro.json'
+  workflow_dispatch:
 
 env:
   USE_CCACHE: 1
@@ -42,9 +46,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_new:
-    name: Build iOS Example App (new architecture)
+  build:
+    name: Build iOS Example App (${{ matrix.arch }})
     runs-on: macOS-15
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [new, old]
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
@@ -53,93 +61,47 @@ jobs:
         with:
           xcode-version: 16.4
 
-      - name: Install npm dependencies (bun)
-        run: bun install
-
-      - name: Setup Ruby (bundle)
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7.2
-          bundler-cache: true
-          working-directory: example/ios
-
-      - name: Install xcpretty
-        run: gem install xcpretty
-
-      - name: Restore Pods cache
-        uses: actions/cache@v4
-        with:
-          path: example/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
-      - name: Install Pods
-        working-directory: example/ios
-        run: pod install
-      - name: Build App
-        working-directory: example/ios
-        run: "set -o pipefail && xcodebuild \
-          CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
-          -derivedDataPath build -UseModernBuildSystem=YES \
-          -workspace $$exampleApp$$.xcworkspace \
-          -scheme $$exampleApp$$ \
-          -sdk iphonesimulator \
-          -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 16' \
-          build \
-          CODE_SIGNING_ALLOWED=NO | xcpretty"
-
-  build_old:
-    name: Build iOS Example App (old architecture)
-    runs-on: macOS-15
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: 16.4
-
-      - name: Install npm dependencies (bun)
+      - name: Install dependencies (bun)
         run: bun install
 
       - name: Disable new architecture in Podfile
+        if: matrix.arch == 'old'
         run: sed -i "" "s/ENV\['RCT_NEW_ARCH_ENABLED'\] = '1'/ENV['RCT_NEW_ARCH_ENABLED'] = '0'/g" example/ios/Podfile
 
-      - name: Restore buildcache
-        uses: mikehardy/buildcache-action@v2
-        continue-on-error: true
-
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: '3.2'
           bundler-cache: true
           working-directory: example/ios
 
       - name: Install xcpretty
         run: gem install xcpretty
 
-      - name: Restore Pods cache
+      - name: Cache CocoaPods
         uses: actions/cache@v4
         with:
-          path: example/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
+          path: |
+            ~/.cocoapods/repos
+            example/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('example/ios/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
+
       - name: Install Pods
         working-directory: example/ios
         run: pod install
+
       - name: Build App
         working-directory: example/ios
-        run: "set -o pipefail && xcodebuild \
-          CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
-          -derivedDataPath build -UseModernBuildSystem=YES \
-          -workspace $$exampleApp$$.xcworkspace \
-          -scheme $$exampleApp$$ \
-          -sdk iphonesimulator \
-          -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 16' \
-          build \
-          CODE_SIGNING_ALLOWED=NO | xcpretty"
+        run: |
+          set -o pipefail && xcodebuild \
+            CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
+            -derivedDataPath build -UseModernBuildSystem=YES \
+            -workspace $$exampleApp$$.xcworkspace \
+            -scheme $$exampleApp$$ \
+            -sdk iphonesimulator \
+            -configuration Debug \
+            -destination 'platform=iOS Simulator,name=iPhone 16' \
+            build \
+            CODE_SIGNING_ALLOWED=NO | xcpretty