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() }} 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.",