From 6713c2a6f3fa219b851f3f28a3187bb01c15168c Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 9 Dec 2021 14:25:31 -0800 Subject: [PATCH 1/2] Merge pull request #6682 from Expensify/version-BUILD-7068258294b289f645899c6cb800aa3637941e0c (cherry picked from commit c3b8d5aaf0f55e6cbf34b78102d84fc31d9c35dc) --- 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 51cf44110b6f..063081461f80 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,8 +149,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001011902 - versionName "1.1.19-2" + versionCode 1001011903 + versionName "1.1.19-3" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 622059fdcb51..42e97d980e65 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.19.2 + 1.1.19.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 8ef35aec1bb0..ec9d06aa6bf6 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.19.2 + 1.1.19.3 diff --git a/package-lock.json b/package-lock.json index eeeb44c289e7..1709719c5242 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.19-2", + "version": "1.1.19-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 47be4204db13..912f26d6142a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.19-2", + "version": "1.1.19-3", "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 f199c019113adbb31c2e63052723fb525f16d239 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 9 Dec 2021 14:22:59 -0800 Subject: [PATCH 2/2] Merge pull request #6655 from Expensify/andrew-sign-cp (cherry picked from commit 7068258294b289f645899c6cb800aa3637941e0c) --- .github/workflows/cherryPick.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index 71888d1c355d..53164f18ff3c 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -70,17 +70,14 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Decrypt Botify GPG key - if: github.actor == 'OSBotify' run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg env: LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }} - name: Import Botify GPG Key - if: github.actor == 'OSBotify' run: cd .github/workflows && gpg --import OSBotify-private-key.asc - name: Set up git for Botify - if: github.actor == 'OSBotify' run: | git config user.signingkey DBF63700F60F5530 git config commit.gpgsign true @@ -89,7 +86,6 @@ jobs: - name: Create branch for new pull request run: | - git config user.name ${{ github.actor }} git checkout -b ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }} git push --set-upstream origin ${{ github.actor }}-cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }} @@ -122,13 +118,13 @@ jobs: - name: Cherry-pick the version-bump to new branch run: | git fetch - git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs ${{ steps.getVersionBumpMergeCommit.outputs.MERGE_COMMIT_SHA }} + git cherry-pick -S -x --mainline 1 --strategy=recursive -Xtheirs ${{ steps.getVersionBumpMergeCommit.outputs.MERGE_COMMIT_SHA }} - name: Cherry-pick the merge commit of target PR to new branch id: cherryPick run: | echo "Attempting to cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}" - if git cherry-pick -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then + if git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then echo "🎉 No conflicts! CP was a success, PR can be automerged 🎉" echo "::set-output name=SHOULD_AUTOMERGE::true" else