From f64d496fa44ce71da6e14a8c69e7e41a5e1893dc Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 17 Oct 2022 18:29:55 -0400
Subject: [PATCH 1/2] Merge pull request #11940 from
 Expensify/version-BUILD-E29A9DDF-CDE4-41A0-BCC7-3B9C8D5430C0

Update version to 1.2.17-4 on main

(cherry picked from commit fb4b2786e6bba24e03203c2b6d230188aa6f23c5)
---
 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 e0d1d2858a5ff..bee6495f23622 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001021703
-        versionName "1.2.17-3"
+        versionCode 1001021704
+        versionName "1.2.17-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index e20b4201e6a52..173ddbe45ef66 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.17.3</string>
+	<string>1.2.17.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6799b450fbd2b..225c28d74308d 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.2.17.3</string>
+	<string>1.2.17.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 045f7fbb6f894..3dc583b76a9ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.17-3",
+  "version": "1.2.17-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.17-3",
+      "version": "1.2.17-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1641d1093cbec..c9eabc0f05679 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.17-3",
+  "version": "1.2.17-4",
   "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 4bb8d7e4f4e05934a5eeb1f664e86a5ae201b120 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:23:43 -0700
Subject: [PATCH 2/2] Merge pull request #11939 from
 Expensify/Rory-RemoveUnnecessaryPipInstall

(cherry picked from commit b514f83aa6ae029b8a5acecf6a030acd5257a55d)
---
 .github/workflows/platformDeploy.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 30359b840148b..20608c66a0b6d 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -211,9 +211,7 @@ jobs:
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Cloudflare CLI
-        run: |
-          pip3 install wheel # need wheel before cloudflare, this is the only way to ensure order.
-          pip3 install cloudflare
+        run: pip3 install cloudflare
 
       - name: Configure AWS Credentials
         # Version: 1.5.5