From 2bd77436568b2538e843483b10ea6e3eb60a9be5 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Fri, 15 Nov 2024 11:46:51 -0700
Subject: [PATCH 1/4] Update with `package_name` and even better debug

---
 .github/workflows/androidBump.yml | 3 +++
 fastlane/Fastfile                 | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/androidBump.yml b/.github/workflows/androidBump.yml
index b2276551852..04a27fd6cf3 100644
--- a/.github/workflows/androidBump.yml
+++ b/.github/workflows/androidBump.yml
@@ -5,6 +5,9 @@ on:
   schedule:
     # Runs at midnight every day
     - cron: '0 0 * * *'
+  push:
+    branches:
+      - andrew-android-bump-fixes-2
 
 jobs:
   android_bump:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 31738835b1d..df917e9cf42 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -265,7 +265,11 @@ platform :android do
 
     desc "Submit HybridApp to 100% rollout on Google Play"
     lane :complete_hybrid_rollout do
-        productionVersionCode = google_play_track_version_codes(track: 'production')
+        productionVersionCode = google_play_track_version_codes(
+                                            track: 'production',
+                                            package_name: "org.me.mobiexpensifyg",
+                                            json_key: './android/app/android-fastlane-json-key.json',
+                                        )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
@@ -285,6 +289,7 @@ platform :android do
     lane :update_hybrid_rollout do |options|
         productionVersionCode = google_play_track_version_codes(
                                     track: 'production',
+                                    package_name: "org.me.mobiexpensifyg",
                                     json_key: './android/app/android-fastlane-json-key.json',
                                 )
         upload_to_play_store(

From 497a61f974e5453fe1373419dac46a0ac240dd7e Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Fri, 15 Nov 2024 11:53:53 -0700
Subject: [PATCH 2/4] Sort and grab last version code

---
 fastlane/Fastfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index df917e9cf42..fd0956ea18b 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -265,7 +265,7 @@ platform :android do
 
     desc "Submit HybridApp to 100% rollout on Google Play"
     lane :complete_hybrid_rollout do
-        productionVersionCode = google_play_track_version_codes(
+        productionVersionCodes = google_play_track_version_codes(
                                             track: 'production',
                                             package_name: "org.me.mobiexpensifyg",
                                             json_key: './android/app/android-fastlane-json-key.json',
@@ -273,7 +273,7 @@ platform :android do
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: '1',
             skip_upload_apk: true,
@@ -287,7 +287,7 @@ platform :android do
 
     desc "Update HybridApp rollout percentage on Google Play"
     lane :update_hybrid_rollout do |options|
-        productionVersionCode = google_play_track_version_codes(
+        productionVersionCodes = google_play_track_version_codes(
                                     track: 'production',
                                     package_name: "org.me.mobiexpensifyg",
                                     json_key: './android/app/android-fastlane-json-key.json',
@@ -295,7 +295,7 @@ platform :android do
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCode.sort.last, # Get the latest version code
             track: 'production',
             rollout: options[:rollout],
             skip_upload_apk: true,

From 4ef3090b419cb7c312e4a66500f9bcb89ddd072e Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Fri, 15 Nov 2024 11:55:19 -0700
Subject: [PATCH 3/4] Add s

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index fd0956ea18b..dcf7c9f238a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -295,7 +295,7 @@ platform :android do
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode.sort.last, # Get the latest version code
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: options[:rollout],
             skip_upload_apk: true,

From 686f62096de13424124214cd06e63f890e21faae Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Fri, 15 Nov 2024 12:00:00 -0700
Subject: [PATCH 4/4] Remove debug trigger

---
 .github/workflows/androidBump.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/androidBump.yml b/.github/workflows/androidBump.yml
index 04a27fd6cf3..b2276551852 100644
--- a/.github/workflows/androidBump.yml
+++ b/.github/workflows/androidBump.yml
@@ -5,9 +5,6 @@ on:
   schedule:
     # Runs at midnight every day
     - cron: '0 0 * * *'
-  push:
-    branches:
-      - andrew-android-bump-fixes-2
 
 jobs:
   android_bump: