From ed25473f31a8d951f9c026f33c3b401298e572a5 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 30 Aug 2022 04:13:57 -0400
Subject: [PATCH 1/2] Merge pull request #10672 from
 Expensify/version-BUILD-F828E363-382C-4067-8F5A-C415C10F0343

Update version to 1.1.93-5 on main

(cherry picked from commit a692b7f448544a7a91094c558bb7fca4b5941840)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 644024dd8a9e..580d905cda68 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001019304
-        versionName "1.1.93-4"
+        versionCode 1001019305
+        versionName "1.1.93-5"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index cc085c401b38..e06888f74e3e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.93.4</string>
+	<string>1.1.93.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 14eb2c1b45bb..b4e795ed0f83 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.93.4</string>
+	<string>1.1.93.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 7318912754cb..65c75c8ff0c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.1.93-4",
+  "version": "1.1.93-5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.1.93-4",
+      "version": "1.1.93-5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 66f7a718b4cb..9bfc68fe281a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.93-4",
+  "version": "1.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.",

From da0e286a2b3f628ab288e9b38a51e86f8f35dfe1 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 30 Aug 2022 10:08:39 +0200
Subject: [PATCH 2/2] Merge pull request #10660 from
 Expensify/Rory-FixVersionRaceCondition

[No QA] Pull latest code after waiting for turnstyle but before creating new branch

(cherry picked from commit dc066f1bd666d72a471c7bf049f9c5a7ab0b7045)
---
 .github/workflows/createNewVersion.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index 5a804c75da3f..5c31a0bb125c 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -55,19 +55,20 @@ jobs:
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
+      - uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
+        with:
+          poll-interval-seconds: 10
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
       - name: Create new branch
         run: |
+          git pull
           BRANCH_NAME="version-${{ inputs.SEMVER_LEVEL }}-$(uuidgen)"
           git checkout -b "$BRANCH_NAME"
           git push --set-upstream origin "$BRANCH_NAME"
           echo "VERSION_BRANCH=$BRANCH_NAME" >> "$GITHUB_ENV"
 
-      - uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
-        with:
-          poll-interval-seconds: 10
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
       - name: Generate version
         id: bumpVersion
         uses: Expensify/App/.github/actions/javascript/bumpVersion@main
