From 6fab6210f9976baf7df339976a22a7547c3f28fd Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 10 Mar 2022 17:11:36 -0800 Subject: [PATCH 1/2] Parse JSON of DO_CHERRY_PICK --- .github/workflows/preDeploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index b82fda5c6aaf..85ad459978f6 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -137,7 +137,7 @@ jobs: run: echo "DO_CHERRY_PICK=${{ fromJSON(needs.chooseDeployActions.outputs.isStagingDeployLocked) && fromJSON(needs.chooseDeployActions.outputs.shouldCherryPick) }}" >> "$GITHUB_ENV" - name: Cherry pick to staging - if: ${{ env.DO_CHERRY_PICK }} + if: ${{ fromJSON(env.DO_CHERRY_PICK) }} uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -161,7 +161,7 @@ jobs: NPM_VERSION: ${{ env.NEW_VERSION }} - name: Comment in StagingDeployCash to alert Applause that a new pull request has been cherry-picked - if: ${{ env.DO_CHERRY_PICK }} + if: ${{ fromJSON(env.DO_CHERRY_PICK) }} run: | PR_URL="https://github.com/Expensify/App/pull/${{ needs.chooseDeployActions.outputs.mergedPullRequest }}" printf -v COMMENT ":clap: Heads up @Expensify/applauseleads :clap:\nA [new pull request](%s) has been :cherries: cherry-picked :cherries: to staging, and will be deployed to staging in version \`%s\` :rocket:" "$PR_URL" ${{ env.NEW_VERSION }} @@ -172,14 +172,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Wait for staging deploys to finish - if: ${{ env.DO_CHERRY_PICK }} + if: ${{ fromJSON(env.DO_CHERRY_PICK) }} uses: Expensify/App/.github/actions/awaitStagingDeploys@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} TAG: ${{ env.NEW_VERSION }} - name: Comment in StagingDeployCash to alert Applause that cherry-picked pull request has been deployed. - if: ${{ env.DO_CHERRY_PICK }} + if: ${{ fromJSON(env.DO_CHERRY_PICK) }} run: | gh issue comment \ "$(gh issue list --label StagingDeployCash --json number --jq '.[0].number')" \ From 572980d94e346409094e071151e04c85eec8ba11 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 11 Mar 2022 01:54:13 +0000 Subject: [PATCH 2/2] Update version to 1.1.42-3 --- 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 e00af92c9fe8..26dda62985aa 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 1001014202 - versionName "1.1.42-2" + versionCode 1001014203 + versionName "1.1.42-3" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 82af3294a0d7..c693e5f82a82 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.42.2 + 1.1.42.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5902684b3e93..bdc05e72a735 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.42.2 + 1.1.42.3 diff --git a/package-lock.json b/package-lock.json index ac4c8d7e385f..ac9e65e362a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.42-2", + "version": "1.1.42-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index eac3b67f2de6..93a52b95394f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.42-2", + "version": "1.1.42-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.",