From 2bd1387a32297ae135c0183bc12a206f12b71da6 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 23 Sep 2021 15:34:12 -0700 Subject: [PATCH] Update StagingDeployCash for manual cherry-picks --- .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() }}