From 56bde33e92d4fd834bcce7791a8cd2baba9996ef Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 13 Aug 2025 17:02:04 +0000 Subject: [PATCH 1/3] Update version to 9.1.93-5 (cherry picked from commit 4c03ba1c3edef18b60270d10a3b7f92ad9753494) (cherry-picked to staging by marcaaron) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- ios/ShareViewController/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e2f500bd4209..e8065790f8c0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009019303 - versionName "9.1.93-3" + versionCode 1009019305 + versionName "9.1.93-5" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 17decf69dc11..11a05b9ce7d5 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.93.3 + 9.1.93.5 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 592c2aeaeba2..48bb2f20e3c4 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.93 CFBundleVersion - 9.1.93.3 + 9.1.93.5 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index 339402ea7315..c465af84dd86 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.93 CFBundleVersion - 9.1.93.3 + 9.1.93.5 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index 15d314868db8..54753a3c17fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.93-3", + "version": "9.1.93-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.93-3", + "version": "9.1.93-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 90944c0a9100..2d6b96a752cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.93-3", + "version": "9.1.93-5", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 0a12df3418180a237036010673051fda40aea891 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 13 Aug 2025 17:02:46 +0000 Subject: [PATCH 2/3] Update Mobile-Expensify submodule version to 9.1.93-5 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index afe6b84f3b8e..0013bd422add 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit afe6b84f3b8e2d6283a9bb2c20750fe33cc2a9a0 +Subproject commit 0013bd422addff0072389afcefb0188c1d82eddc From 36265eac503d69eda237bbed23a735d1be275535 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Wed, 13 Aug 2025 06:57:40 -1000 Subject: [PATCH 3/3] Merge pull request #68407 from Expensify/marcaaron-fixVersions [CP Staging] Sync App version after race condition failed to recover (cherry picked from commit 3858421dd1f8595937cca34cabfe979897fdd679) (cherry-picked to staging by marcaaron) --- .github/workflows/createNewVersion.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index e0be52a649c9..84e22d394fef 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -124,7 +124,12 @@ jobs: git commit -m "Update Mobile-Expensify submodule version to ${{ steps.bumpVersion.outputs.NEW_VERSION }}" if ! git push origin main; then echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once." - git fetch origin main + if ! git fetch origin main; then + echo "::error:: ❌ Unable to fetch main" + echo "::error:: This can happen when Mobile-Expensify and E/App repos got out of sync." + echo "::error:: We likely need to manually bump the version in E/App to match Mobile-Expensify." + exit 1 + fi if ! git rebase origin/main; then echo "::error:: Rebase failed while retrying E/App push" exit 1