Skip to content

🍒 Cherry pick PR #68407 to staging 🍒 #68466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 3 commits into from
Aug 13, 2025
Merged

🍒 Cherry pick PR #68407 to staging 🍒 #68466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56bde33
Update version to 9.1.93-5
OSBotify Aug 13, 2025
0a12df3
Update Mobile-Expensify submodule version to 9.1.93-5
OSBotify Aug 13, 2025
36265ea
Merge pull request #68407 from Expensify/marcaaron-fixVersions
marcaaron Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/createNewVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Mobile-Expensify
Open in desktop
Submodule Mobile-Expensify updated from afe6b8 to 0013bd
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.1.93.3</string>
<string>9.1.93.5</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ShareViewController/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
Loading