From 8ed4153a50f13d7477d6d02a3215ccbf6d8f9aba Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 27 Sep 2021 09:51:00 -0700
Subject: [PATCH 1/2] Merge pull request #5538 from
Expensify/version-BUILD-b4c69f299d6b73eede7e4c827b66118e6c322fa3
(cherry picked from commit e33f39c9de1d134ab5fef8a3cafa2bcbc5876833)
---
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 85ac2da8084d..2f0a06914834 100644
--- a/android/app/build.gradle
+++ b/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 {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 56c1feeeb459..2dece4813d3c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.2.5
+ 1.1.2.6
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6beb9f973f9d..538ef4d80789 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.2.5
+ 1.1.2.6
diff --git a/package-lock.json b/package-lock.json
index 66f35a5dd806..84fed12ca91b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.2-5",
+ "version": "1.1.2-6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 7651ba615e83..95de0a347b1e 100644
--- a/package.json
+++ b/package.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.",
From 9ace7776b55b9c1a80cb242eaa4960408795e143 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Mon, 27 Sep 2021 09:46:17 -0700
Subject: [PATCH 2/2] Merge pull request #5473 from
Expensify/Rory-UpdateDeployChecklistWithManualCP
(cherry picked from commit b4c69f299d6b73eede7e4c827b66118e6c322fa3)
---
.github/workflows/cherryPick.yml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index 712d3304eb5a..1fa46f0c51a0 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.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() }}