From dcc341673fb78e40c304bbb6cc0e84ce39cf3f72 Mon Sep 17 00:00:00 2001
From: jayssj11 <cooljay.gupta@gmail.com>
Date: Thu, 31 Jul 2025 16:05:55 +0530
Subject: [PATCH] fix android build failure (#827)

- Modified package.json to create separate install commands for iOS and Android
  - Updated mobile-setup/action.yml to use platform-specific install commands
  - Android builds will no longer try to run pod install and increment ios build number
---
 .github/actions/mobile-setup/action.yml |  6 +++++-
 .github/workflows/mobile-deploy.yml     | 10 ++++------
 app/package.json                        |  3 ++-
 app/version.json                        |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/actions/mobile-setup/action.yml b/.github/actions/mobile-setup/action.yml
index ca30e4642..da6bc5b46 100644
--- a/.github/actions/mobile-setup/action.yml
+++ b/.github/actions/mobile-setup/action.yml
@@ -79,7 +79,11 @@ runs:
         fi
         
         # Run mobile-specific installation
-        yarn install-app:mobile-deploy
+        if [[ "${{ runner.os }}" == "macOS" ]]; then
+          yarn install-app:mobile-deploy:ios
+        else
+          yarn install-app:mobile-deploy
+        fi
         
         # Install Ruby gems with bundler (respecting cache)
         echo "📦 Installing Ruby gems with strict lock file..."
diff --git a/.github/workflows/mobile-deploy.yml b/.github/workflows/mobile-deploy.yml
index ecd98047e..dd2278a05 100644
--- a/.github/workflows/mobile-deploy.yml
+++ b/.github/workflows/mobile-deploy.yml
@@ -494,12 +494,11 @@ jobs:
           app_path: ${{ env.APP_PATH }}
 
       - name: Commit updated build number
-        # disable for now, commit doesn't work as expected
-        if: false #${{ !env.ACT }}
+        if: ${{ !env.ACT && success() }}
         uses: ./.github/actions/push-changes
         with:
           commit_message: "incrementing ios build number for version ${{ env.VERSION }}"
-          commit_paths: "./app/ios/OpenPassport/Info.plist ./app/ios/Self.xcodeproj/project.pbxproj"
+          commit_paths: "./app/version.json"
 
       - name: Monitor cache usage
         if: always()
@@ -752,12 +751,11 @@ jobs:
           app_path: ${{ env.APP_PATH }}
 
       - name: Commit updated build version
-        # disable for now, commit doesn't work as expected
-        if: false #${{ !env.ACT }}
+        if: ${{ !env.ACT && success() }}
         uses: ./.github/actions/push-changes
         with:
           commit_message: "incrementing android build version for version ${{ env.VERSION }}"
-          commit_paths: "./app/android/app/build.gradle"
+          commit_paths: "./app/version.json"
 
       - name: Monitor cache usage
         if: always()
diff --git a/app/package.json b/app/package.json
index ec0febd70..703dba412 100644
--- a/app/package.json
+++ b/app/package.json
@@ -27,7 +27,8 @@
     "format": "yarn nice",
     "ia": "yarn install-app",
     "install-app": "yarn install-app:setup && cd ios && bundle install && bundle exec pod install && cd .. && yarn clean:xcode-env-local",
-    "install-app:mobile-deploy": "yarn install-app:setup && yarn clean:xcode-env-local",
+    "install-app:mobile-deploy": "yarn install && yarn build:deps && yarn clean:xcode-env-local",
+    "install-app:mobile-deploy:ios": "yarn install-app:setup && yarn clean:xcode-env-local",
     "install-app:setup": "yarn install && yarn build:deps && cd ios && bundle install && bundle exec pod install && cd ..",
     "ios": "react-native run-ios",
     "ios:fastlane-debug": "yarn reinstall && bundle exec fastlane --verbose ios internal_test",
diff --git a/app/version.json b/app/version.json
index b6b4a525c..f525ae3cb 100644
--- a/app/version.json
+++ b/app/version.json
@@ -1,6 +1,6 @@
 {
   "ios": {
-    "build": 151,
+    "build": 152,
     "lastDeployed": null
   },
   "android": {