fix: streamline Android and iOS CI workflows by consolidating jobs and enhancing caching mechanisms

YogendraShelke · YogendraShelke · commit 6e53043aead4 · 2026-01-18T16:54:24.000+05:30
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -10,11 +10,10 @@ env:
   AVD_NAME: 'Pixel_API_34'
 
 jobs:
-  # Job 1: Build APK
-  build:
-    name: Build APK
+  android:
+    name: Android Build & Test
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
 
     steps:
       - name: Checkout
@@ -32,13 +31,31 @@ jobs:
       - name: Setup Android SDK
         uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407
 
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
+      # Check caches first
       - name: Cache APK build output
         id: cache-apk
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
           path: example/android/app/build/outputs/apk/debug/app-debug.apk
           key: ${{ runner.os }}-apk-${{ hashFiles('android/**/*.{java,kt,xml}', 'example/android/**/*.{java,kt,xml,gradle}', 'src/**/*.{js,jsx,ts,tsx}', 'package.json', 'yarn.lock') }}
 
+      - name: AVD cache
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ env.DEVICE_API_LEVEL }}-${{ env.DEVICE_ARCH }}
+
+      # Build dependencies (only if APK not cached)
       - name: Cache NDK
         id: cache-ndk
         if: steps.cache-apk.outputs.cache-hit != 'true'
@@ -65,53 +82,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
+      # Build APK (only if not cached)
       - name: Build APK with Gradle
         if: steps.cache-apk.outputs.cache-hit != 'true'
         run: ./gradlew assembleDebug
         working-directory: example/android
 
-      - name: Upload APK artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
-        with:
-          name: android-apk
-          path: example/android/app/build/outputs/apk/debug/app-debug.apk
-          retention-days: 1
-
-  # Job 2: Setup AVD (runs in parallel with build)
-  prepare-device:
-    name: Prepare Emulator
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-
-      - name: Setup Java
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
-      - name: AVD cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ env.DEVICE_API_LEVEL }}-${{ env.DEVICE_ARCH }}
-
+      # Create AVD (only if not cached, runs after build)
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b
@@ -127,53 +104,6 @@ jobs:
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -memory 4096
           script: echo "Generated AVD snapshot for caching."
 
-  # Job 3: Run tests (waits for both build and device setup)
-  test:
-    name: Run Tests
-    runs-on: ubuntu-latest
-    needs: [build, prepare-device]
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-
-      - name: Setup Project
-        uses: ./.github/actions/setup-node-yarn
-
-      - name: Setup Java
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407
-
-      - name: Enable KVM
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-          ls /dev/kvm
-
-      # Download pre-built APK from build job
-      - name: Download APK artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
-        with:
-          name: android-apk
-          path: example/android/app/build/outputs/apk/debug/
-
-      # Restore AVD from cache (created in prepare-device job)
-      - name: AVD cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ env.DEVICE_API_LEVEL }}-${{ env.DEVICE_ARCH }}
-
       # Run tests with emulator
       - name: Run Harness E2E tests
         uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b
@@ -191,3 +121,9 @@ jobs:
           script: |
             adb install -r "./android/app/build/outputs/apk/debug/app-debug.apk"
             yarn harness:android
+
+      # Cleanup
+      - name: Stop Gradle Daemon
+        if: always()
+        working-directory: example/android
+        run: ./gradlew --stop
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -9,11 +9,10 @@ env:
   USE_CCACHE: 1
 
 jobs:
-  # Job 1: Build iOS App
-  build:
-    name: Build iOS App
+  ios:
+    name: iOS Build & Test
     runs-on: macos-latest
-    timeout-minutes: 40
+    timeout-minutes: 60
     env:
       DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
 
@@ -34,13 +33,15 @@ jobs:
           bundler-cache: true
           working-directory: example
 
+      # Check if app is cached
       - name: Cache iOS build artifacts
         id: cache-ios-app
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
           path: example/ios/build/Build/Products/Debug-iphonesimulator/MendixNativeExample.app
           key: ios-app-${{ runner.os }}-${{ hashFiles('example/ios/Podfile.lock', 'example/ios/**/*.{swift,h,m,mm}', 'ios/**/*.{swift,h,m,mm}', 'src/**/*.{js,jsx,ts,tsx}', 'package.json', 'yarn.lock') }}
 
+      # Build dependencies (only if app not cached)
       - name: Cache DerivedData
         if: steps.cache-ios-app.outputs.cache-hit != 'true'
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
@@ -69,6 +70,7 @@ jobs:
           bundle install
           cd ios && bundle exec pod install
 
+      # Build iOS app (only if not cached)
       - name: Build iOS app for simulator
         if: steps.cache-ios-app.outputs.cache-hit != 'true'
         working-directory: example/ios
@@ -82,96 +84,7 @@ jobs:
             -derivedDataPath build \
             build
 
-      - name: Upload iOS app artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
-        with:
-          name: ios-app
-          path: example/ios/build/Build/Products/Debug-iphonesimulator/MendixNativeExample.app
-          retention-days: 1
-
-  # Job 2: Setup Simulator (runs in parallel with build)
-  prepare-device:
-    name: Prepare Simulator
-    runs-on: macos-latest
-    timeout-minutes: 10
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-
-      - name: Setup Xcode
-        run: sudo xcode-select -s /Applications/Xcode_26.1.app
-
-      - name: Setup iOS Simulator
-        uses: futureware-tech/simulator-action@dab10d813144ef59b48d401cd95da151222ef8cd
-        with:
-          model: ${{ env.DEVICE_MODEL }}
-          os: iOS
-          os_version: ${{ env.IOS_VERSION }}
-          wait_for_boot: true
-          erase_before_boot: false
-
-      - name: Get booted simulator UDID
-        id: sim-udid
-        run: |
-          UDID=$(xcrun simctl list devices booted | grep -o '[A-F0-9]\{8\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{4\}-[A-F0-9]\{12\}' | head -n 1)
-          echo "UDID=$UDID"
-          echo "udid=$UDID" >> $GITHUB_OUTPUT
-
-      - name: Save simulator UDID to artifact
-        run: |
-          echo "${{ steps.sim-udid.outputs.udid }}" > simulator-udid.txt
-
-      - name: Upload simulator UDID artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
-        with:
-          name: simulator-udid
-          path: simulator-udid.txt
-          retention-days: 1
-
-  # Job 3: Run tests (waits for both build and device setup)
-  test:
-    name: Run Tests
-    runs-on: macos-latest
-    needs: [build, prepare-device]
-    timeout-minutes: 30
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-
-      - name: Setup Project
-        uses: ./.github/actions/setup-node-yarn
-
-      - name: Setup Xcode
-        run: sudo xcode-select -s /Applications/Xcode_26.1.app
-
-      # Download pre-built iOS app from build job
-      - name: Download iOS app artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
-        with:
-          name: ios-app
-          path: example/ios/build/Build/Products/Debug-iphonesimulator/MendixNativeExample.app
-
-      # Download simulator UDID from prepare-device job
-      - name: Download simulator UDID artifact
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
-        with:
-          name: simulator-udid
-          path: .
-
-      - name: Read simulator UDID
-        id: sim-udid
-        run: |
-          UDID=$(cat simulator-udid.txt)
-          echo "UDID=$UDID"
-          echo "udid=$UDID" >> $GITHUB_OUTPUT
-
-      # Boot the simulator (it may have been shut down between jobs)
+      # Setup simulator (after build)
       - name: Setup iOS Simulator
         uses: futureware-tech/simulator-action@dab10d813144ef59b48d401cd95da151222ef8cd
         with:
@@ -181,10 +94,12 @@ jobs:
           wait_for_boot: true
           erase_before_boot: false
 
+      # Install app on simulator
       - name: Install app on simulator
         run: |
           xcrun simctl install booted example/ios/build/Build/Products/Debug-iphonesimulator/MendixNativeExample.app
 
+      # Run tests
       - name: Run Harness E2E tests
         working-directory: example
         run: yarn harness:ios
