Merge pull request #5539 from Expensify/roryabraham-cherry-pick-staging-5473

Author: OSBotify

.github/workflows/cherryPick.yml

@@ -189,6 +189,25 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           PULL_REQUEST: ${{ steps.createPullRequest.outputs.pr_number }}
 
+      # Create a local git tag on staging so that GitUtils.getPullRequestsMergedBetween can use `git log` to generate a
+      # list of pull requests that were merged between this version tag and another.
+      # NOTE: This tag is only used locally and shouldn't be pushed to the remote.
+      # If it was pushed, that would trigger the staging deploy which is handled in a separate workflow (deploy.yml)
+      - name: Tag staging
+        if: ${{ github.actor != 'OSBotify' }}
+        run: |
+          git checkout staging
+          git pull origin staging
+          git tag ${{ env.NEW_VERSION }}
+
+      # Note: we only run this action if the PR was manually CP'd. Otherwise, the deploy checklist is updated from preDeploy.yml
+      - name: Update StagingDeployCash
+        if: ${{ github.actor != 'OSBotify' }}
+        uses: Expensify/App/.github/actions/createOrUpdateStagingDeploy@main
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+          NPM_VERSION: ${{ env.NEW_VERSION }}
+
       - name: 'Announces a CP failure in the #announce Slack room'
         uses: 8398a7/action-slack@v3
         if: ${{ failure() }}

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010205
-        versionName "1.1.2-5"
+        versionCode 1001010206
+        versionName "1.1.2-6"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.2.5</string>
+	<string>1.1.2.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.2.5</string>
+	<string>1.1.2.6</string>
 </dict>
 </plist>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.2-5",
+  "version": "1.1.2-6",
   "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.",