From 50a0dbab55458197f62dc17f7b014807ad8c8a21 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 28 Oct 2024 20:38:18 +0000 Subject: [PATCH 1/3] Update version to 9.0.54-8 (cherry picked from commit c3dde46202d2f48934ef7aa617d69c8b4c0b5ff6) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/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 c6039917765b..bc80d48537aa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -110,8 +110,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009005407 - versionName "9.0.54-7" + versionCode 1009005408 + versionName "9.0.54-8" // 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 902ac4d2ca66..a9de2edc2237 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.54.7 + 9.0.54.8 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 6996643e3da6..a82c58085f1f 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.54.7 + 9.0.54.8 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 03d9d45f93f8..fa6859d518e2 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.54 CFBundleVersion - 9.0.54.7 + 9.0.54.8 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index dde2979b6bb6..26576e224acd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.54-7", + "version": "9.0.54-8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.54-7", + "version": "9.0.54-8", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 0d93975349c1..8e67d4740bc8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.54-7", + "version": "9.0.54-8", "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 e8fffa5f04ecb405d07b826bf017db837fa6a8f3 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Mon, 28 Oct 2024 10:35:43 -0600 Subject: [PATCH 2/3] Merge pull request #50014 from Expensify/andrew-mobile-deploy [No QA]Build HybridApp in open source when we deploy to staging (cherry picked from commit a91219357cbdb030eb81088ea2b839b25e1f9440) (CP triggered by AndrewGable) --- .github/workflows/createNewVersion.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 93fe07be9298..8d65c8c26d3d 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -117,6 +117,7 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} +<<<<<<< HEAD - name: Check out `App` repo uses: actions/checkout@v4 with: @@ -126,6 +127,9 @@ jobs: token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }} - name: Check out `Mobile-Expensify` repo +======= + - name: Checkout +>>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) uses: actions/checkout@v4 with: repository: 'Expensify/Mobile-Expensify' @@ -144,6 +148,7 @@ jobs: with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} +<<<<<<< HEAD - name: Generate HybridApp version run: | # Generate all flavors of the version @@ -170,6 +175,13 @@ jobs: # Update JS HybridApp Version sed -i .bak -E "s/\"version\": \"([0-9\.]*)\"/\"version\": \"$FULL_APP_VERSION\"/" $JS_CONFIG_FILE +======= + - name: Generate version + run: | + SHORT_APP_VERSION=$(echo "$NEW_VERSION" | awk -F'-' '{print $1}') + BUILD_NUMBER=$(echo "$NEW_VERSION" | awk -F'-' '{print $2}') + tools/buildtools/bump-version-automatically.sh "$SHORT_APP_VERSION" "$BUILD_NUMBER" +>>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) env: NEW_VERSION: ${{ needs.createNewVersion.outputs.NEW_VERSION }} @@ -179,7 +191,11 @@ jobs: ./Android/AndroidManifest.xml \ ./app/config/config.json \ ./iOS/Expensify/Expensify-Info.plist\ +<<<<<<< HEAD ./iOS/SmartScanExtension/Info.plist +======= + ./iOS/SmartScanExtension/Info.plist \ +>>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) git commit -m "Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}" - name: Update main branch From 5601218ec6140ad61055a941846e303615f6153e Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 28 Oct 2024 14:42:24 -0600 Subject: [PATCH 3/3] Fix merge conflicts --- .github/workflows/createNewVersion.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 8d65c8c26d3d..93fe07be9298 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -117,7 +117,6 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} -<<<<<<< HEAD - name: Check out `App` repo uses: actions/checkout@v4 with: @@ -127,9 +126,6 @@ jobs: token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }} - name: Check out `Mobile-Expensify` repo -======= - - name: Checkout ->>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) uses: actions/checkout@v4 with: repository: 'Expensify/Mobile-Expensify' @@ -148,7 +144,6 @@ jobs: with: GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} -<<<<<<< HEAD - name: Generate HybridApp version run: | # Generate all flavors of the version @@ -175,13 +170,6 @@ jobs: # Update JS HybridApp Version sed -i .bak -E "s/\"version\": \"([0-9\.]*)\"/\"version\": \"$FULL_APP_VERSION\"/" $JS_CONFIG_FILE -======= - - name: Generate version - run: | - SHORT_APP_VERSION=$(echo "$NEW_VERSION" | awk -F'-' '{print $1}') - BUILD_NUMBER=$(echo "$NEW_VERSION" | awk -F'-' '{print $2}') - tools/buildtools/bump-version-automatically.sh "$SHORT_APP_VERSION" "$BUILD_NUMBER" ->>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) env: NEW_VERSION: ${{ needs.createNewVersion.outputs.NEW_VERSION }} @@ -191,11 +179,7 @@ jobs: ./Android/AndroidManifest.xml \ ./app/config/config.json \ ./iOS/Expensify/Expensify-Info.plist\ -<<<<<<< HEAD ./iOS/SmartScanExtension/Info.plist -======= - ./iOS/SmartScanExtension/Info.plist \ ->>>>>>> a912193 (Merge pull request #50014 from Expensify/andrew-mobile-deploy) git commit -m "Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}" - name: Update main branch