Merge pull request Expensify#68407 from Expensify/marcaaron-fixVersions

[CP Staging] Sync App version after race condition failed to recover

Author: marcaaron

.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

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"

ios/NewExpensify/Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.93.3</string>
+	<string>9.1.93.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.93</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.93.3</string>
+	<string>9.1.93.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.93</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.93.3</string>
+	<string>9.1.93.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package-lock.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.",