Merge branch 'main' of https://github.com/mananjadhav/App into fix/si…

…gnin-page-layout # Conflicts: # src/components/withWindowDimensions.js # src/styles/variables.js
Expensify · Aug 26, 2021 · 5e62d66 · 5e62d66
2 parents 99b1bbc + d02317a
commit 5e62d66
Show file tree

Hide file tree

Showing 78 changed files with 928 additions and 395 deletions.
diff --git a/.env.example b/.env.example
@@ -10,3 +10,4 @@ USE_NGROK=false
 USE_WEB_PROXY=false
 USE_WDYR=false
 CAPTURE_METRICS=false
+ONYX_METRICS=false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,15 @@
 <!-- Explanation of the change or anything fishy that is going on -->
 
 ### Fixed Issues
-<!-- Please replace GH_LINK with the link to the GitHub issue this Pull Request is fixing -->
+<!---
+Please replace GH_LINK with the link to the GitHub issue this Pull Request is fixing.
+Do NOT add the special GH keywords like `fixed` etc, we have our own process of managing the flow.
+It MUST be an entire link to the issue; otherwise, the linking will not work as expected.
+
+Make sure this section looks similar to this (you can link multiple issues using the same formatting, just add a new line):
+
+$ https://github.com/Expensify/App/issues/4723
+--->
 $ GH_LINK
 
 ### Tests

diff --git a/.github/actions/checkDeployBlockers/checkDeployBlockers.js b/.github/actions/checkDeployBlockers/checkDeployBlockers.js
@@ -49,7 +49,7 @@ const run = function () {
 
             console.log('Verifying that the last comment is the :shipit: seal of approval');
             const lastComment = comments.data.pop();
-            const shipItRegex = /^:shipit:/g;
+            const shipItRegex = /:shipit:/g;
             if (_.isNull(shipItRegex.exec(lastComment.body))) {
                 console.log('The last comment on the issue was not :shipit');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);

diff --git a/.github/actions/checkDeployBlockers/index.js b/.github/actions/checkDeployBlockers/index.js
@@ -59,7 +59,7 @@ const run = function () {
 
             console.log('Verifying that the last comment is the :shipit: seal of approval');
             const lastComment = comments.data.pop();
-            const shipItRegex = /^:shipit:/g;
+            const shipItRegex = /:shipit:/g;
             if (_.isNull(shipItRegex.exec(lastComment.body))) {
                 console.log('The last comment on the issue was not :shipit');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);

diff --git a/.github/actions/reopenIssueWithComment/index.js b/.github/actions/reopenIssueWithComment/index.js
@@ -25,7 +25,7 @@ function reopenIssueWithComment() {
         .then(() => {
             console.log(`Commenting on issue #${issueNumber}`);
             return GithubUtils.octokit.issues.createComment({
-                owner: GithubUtils.GithubUtilsGITHUB_OWNER,
+                owner: GithubUtils.GITHUB_OWNER,
                 repo: GithubUtils.EXPENSIFY_CASH_REPO,
                 issue_number: issueNumber,
                 body: comment,

diff --git a/.github/actions/reopenIssueWithComment/reopenIssueWithComment.js b/.github/actions/reopenIssueWithComment/reopenIssueWithComment.js
@@ -15,7 +15,7 @@ function reopenIssueWithComment() {
         .then(() => {
             console.log(`Commenting on issue #${issueNumber}`);
             return GithubUtils.octokit.issues.createComment({
-                owner: GithubUtils.GithubUtilsGITHUB_OWNER,
+                owner: GithubUtils.GITHUB_OWNER,
                 repo: GithubUtils.EXPENSIFY_CASH_REPO,
                 issue_number: issueNumber,
                 body: comment,

diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
@@ -179,3 +179,20 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           PULL_REQUEST: ${{ steps.createPullRequest.outputs.pr_number }}
+
+      - name: 'Announces a CP failure in the #announce Slack room'
+        uses: 8398a7/action-slack@v3
+        if: ${{ failure() }}
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#announce',
+              attachments: [{
+                color: "#DB4545",
+                text: `@mobile-deployers 💥 Failed to CP https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -75,7 +75,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml
@@ -85,7 +85,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
@@ -114,7 +114,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml
@@ -65,7 +65,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -307,7 +307,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }
@@ -330,12 +330,6 @@ jobs:
         with:
           node-version: '14.x'
 
-      - name: Determine if this was a cherry-pick
-        id: isStagingDeployLocked
-        uses: Expensify/App/.github/actions/isStagingDeployLocked@main
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV
 
@@ -358,3 +352,36 @@ jobs:
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
+
+      - name: 'Announces the deploy in the #announce Slack room'
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#announce',
+              attachments: [{
+                color: 'good',
+                text: `🎉️ Successfully deployed ${process.env.AS_REPO} v${{ env.VERSION }} to ${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' && 'production' || 'staging' }} 🎉️`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+      - name: 'Announces a production deploy in the #expensify-open-source Slack room'
+        uses: 8398a7/action-slack@v3
+        if: ${{ env.SHOULD_DEPLOY_PRODUCTION == 'true' }}
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#expensify-open-source',
+              attachments: [{
+                color: 'good',
+                text: `🎉️ Successfully deployed ${process.env.AS_REPO} v${{ env.VERSION }} to production 🎉️`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
@@ -124,7 +124,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml
@@ -127,7 +127,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }

diff --git a/.github/workflows/warnCPLabel.yml b/.github/workflows/warnCPLabel.yml
@@ -32,7 +32,7 @@ jobs:
               channel: '#announce',
               attachments: [{
                 color: "#DB4545",
-                pretext: `<!here>`,
+                pretext: `<!subteam^S4TJJ3PSL>`,
                 text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
               }]
             }