Merge pull request #4442 from Expensify/cherry-pick-staging-4336

Author: OSBotify

.github/actions/createOrUpdateStagingDeploy/index.js

@@ -193,8 +193,10 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],

.github/actions/getDeployPullRequestList/index.js

@@ -117,8 +117,10 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],

.github/libs/GitUtils.js

@@ -9,8 +9,10 @@ const {execSync} = require('child_process');
  * @returns {Array}
  */
 function getPullRequestsMergedBetween(fromRef, toRef) {
+    const command = `git log --format="%s" ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
-    const localGitLogs = execSync(`git log --format="%s" ${fromRef}...${toRef}`).toString();
+    console.log('Running command: ', command);
+    const localGitLogs = execSync(command).toString();
     return _.map(
         [...localGitLogs.matchAll(/Merge pull request #(\d{1,6}) from (?!Expensify\/(?:master|main|version-))/g)],
         match => match[1],

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008206
-        versionName "1.0.82-6"
+        versionCode 1001008207
+        versionName "1.0.82-7"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.82.6</string>
+	<string>1.0.82.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.82-6",
+  "version": "1.0.82-7",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",