From 825727827b6e3b41a14fd403e561c969c6052180 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 12 Aug 2025 10:17:58 -1000 Subject: [PATCH 1/2] Sync App version after race condition failed to recover --- android/app/build.gradle | 2 +- 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, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e2f500bd4209..17d69518c46a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -115,7 +115,7 @@ android { targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled versionCode 1009019303 - versionName "9.1.93-3" + versionName "9.1.93-4" // 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..6e5c20f97eac 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.93.3 + 9.1.93.4 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 592c2aeaeba2..cb377a41392d 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.4 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index 339402ea7315..64190612963c 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.4 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index 8d79db110db0..3344337866ea 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-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.93-3", + "version": "9.1.93-4", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 602e264f827e..f745a4e41e17 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.93-3", + "version": "9.1.93-4", "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 975122167c3133da3c136e51c768ec4e3489b4fe Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Tue, 12 Aug 2025 10:33:32 -1000 Subject: [PATCH 2/2] Add better error handling --- .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