From 858e23d4de4dd35a4581a9a79d1d9d8a5947505b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 30 Jun 2022 11:21:22 -0700
Subject: [PATCH 1/2] Merge pull request #9644 from
 Expensify/version-BUILD-1B35DE4E-F4CF-4B44-9399-11DC38D0EA04

Update version to 1.1.79-6 on main

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7b035ccb2c22..401b652bd8b2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017905
-        versionName "1.1.79-5"
+        versionCode 1001017906
+        versionName "1.1.79-6"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1b007001f840..065050aa3a60 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.79.5</string>
+	<string>1.1.79.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ed9fbfd99da1..f4959ea3631d 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.79.5</string>
+	<string>1.1.79.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 1fbd583bb2fa..dddbb60a6f07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-5",
+  "version": "1.1.79-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d07d2f8d6c35..2b421c204ecf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-5",
+  "version": "1.1.79-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.",

From f5447c87677a0f64dcf8aed67858de67af6152de Mon Sep 17 00:00:00 2001
From: Andre Fonseca <andreskarsnik@gmail.com>
Date: Thu, 30 Jun 2022 18:20:17 +0100
Subject: [PATCH 2/2] Merge pull request #9639 from
 Expensify/Rory-UniqueBranchName

(cherry picked from commit 3d6b958e2891c2975eb3f098e9e6932be611515c)
---
 .github/workflows/createNewVersion.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index 5e442002ea4e..645e21d5d5c8 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -44,9 +44,10 @@ jobs:
 
       - name: Create new branch
         run: |
-          git checkout -b version-${{ github.event.inputs.SEMVER_LEVEL }}-${{ github.sha }}
-          git push --set-upstream origin version-${{ github.event.inputs.SEMVER_LEVEL }}-${{ github.sha }}
-          echo "VERSION_BRANCH=version-${{ github.event.inputs.SEMVER_LEVEL }}-${{ github.sha }}" >> "$GITHUB_ENV"
+          BRANCH_NAME="version-${{ github.event.inputs.SEMVER_LEVEL }}-$(uuidgen)"
+          git checkout -b "$BRANCH_NAME"
+          git push --set-upstream origin "$BRANCH_NAME"
+          echo "VERSION_BRANCH=$BRANCH_NAME" >> "$GITHUB_ENV"
 
       - name: Generate version
         id: bumpVersion