[pull] main from Expensify:main

.eslintrc.js

@@ -24,7 +24,7 @@ const restrictedImportPatterns = [
 ];
 
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'prettier'],
+    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'plugin:@dword-design/import-alias/recommended', 'prettier'],
     plugins: ['react-hooks', 'react-native-a11y'],
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
@@ -49,8 +49,31 @@ module.exports = {
                         touchables: ['PressableWithoutFeedback', 'PressableWithFeedback'],
                     },
                 ],
+                '@dword-design/import-alias/prefer-alias': [
+                    'warn',
+                    {
+                        alias: {
+                            '@assets': './assets',
+                            '@components': './src/components',
+                            '@hooks': './src/hooks',
+                            // This is needed up here, if not @libs/actions would take the priority
+                            '@userActions': './src/libs/actions',
+                            '@libs': './src/libs',
+                            '@navigation': './src/libs/Navigation',
+                            '@pages': './src/pages',
+                            '@styles': './src/styles',
+                            // This path is provide alias for files like `ONYXKEYS` and `CONST`.
+                            '@src': './src',
+                        },
+                    },
+                ],
             },
         },
+        // This helps disable the `prefer-alias` rule to be enabled for specific directories
+        {
+            files: ['tests/**/*.js', 'tests/**/*.ts', 'tests/**/*.jsx', 'assets/**/*.js', '.storybook/**/*.js'],
+            rules: {'@dword-design/import-alias/prefer-alias': ['off']},
+        },
         {
             files: ['*.js', '*.jsx'],
             settings: {
@@ -79,6 +102,7 @@ module.exports = {
                     },
                 ],
                 curly: 'error',
+                'react/display-name': 'error',
             },
         },
         {

.github/actionlint.yaml

@@ -3,3 +3,4 @@ self-hosted-runner:
   labels:
     - ubuntu-latest-xl
     - macos-12-xl
+    - macos-13-xlarge

.github/actions/composite/buildAndroidAPK/action.yml

@@ -11,7 +11,7 @@ runs:
   steps:
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-    - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+    - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
       with:
         ruby-version: "2.7"
         bundler-cache: true

.github/actions/composite/setupGitForOSBotifyApp/action.yml

@@ -24,6 +24,21 @@ outputs:
 runs:
   using: composite
   steps:
+    - name: Check if gpg encrypted private key is present
+      id: key_check
+      shell: bash
+      run: |
+        if [[ -f .github/workflows/OSBotify-private-key.asc.gpg ]]; then
+          echo "::set-output name=key_exists::true"
+        fi
+
+    - name: Checkout
+      uses: actions/checkout@v3
+      if: steps.key_check.outputs.key_exists != 'true'
+      with:
+        sparse-checkout: |
+          .github
+
     - name: Decrypt OSBotify GPG key
       run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase=${{ inputs.GPG_PASSPHRASE }} --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
       shell: bash
@@ -47,7 +62,7 @@ runs:
 
     - name: Generate a token
       id: generateToken
-      uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+      uses: actions/create-github-app-token@9d97a4282b2c51a2f4f0465b9326399f53c890d4
       with:
-        app_id: ${{ inputs.OS_BOTIFY_APP_ID }}
-        private_key: ${{ inputs.OS_BOTIFY_PRIVATE_KEY }}
+        app-id: ${{ inputs.OS_BOTIFY_APP_ID }}
+        private-key: ${{ inputs.OS_BOTIFY_PRIVATE_KEY }}

.github/workflows/authorChecklist.yml

@@ -9,7 +9,7 @@ jobs:
   # then you also need to go into PHP and update the name of this job in the GH_JOB_NAME_CHECKLIST constant
   checklist:
     runs-on: ubuntu-latest
-    if: github.actor != 'OSBotify'
+    if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
     steps:
       - name: authorChecklist.js
         uses: Expensify/App/.github/actions/javascript/authorChecklist@main

.github/workflows/cla.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     # This job only runs for pull request comments or pull request target events (not issue comments)
     # It does not run for pull requests created by OSBotify
-    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify') }}
+    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
     steps:
         - name: CLA comment check
           uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73

.github/workflows/e2ePerformanceTests.yml

@@ -125,6 +125,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
+
       - name: Make zip directory for everything to send to AWS Device Farm
         run: mkdir zip
 
@@ -137,7 +140,7 @@ jobs:
 
       # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
       - name: Rename baseline APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-main.apk"
 
       - name: Download delta APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
@@ -147,7 +150,7 @@ jobs:
           path: zip
 
       - name: Rename delta APK
-        run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+        run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-delta.apk"
 
       - name: Copy e2e code into zip folder
         run: cp -r tests/e2e zip
@@ -162,44 +165,72 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: us-west-2
 
-      - name: Schedule AWS Device Farm test run
+      - name: Schedule AWS Device Farm test run on main branch
         uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+        id: schedule-awsdf-main
         with:
           name: App E2E Performance Regression Tests
           project_arn: ${{ secrets.AWS_PROJECT_ARN }}
           device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
-          app_file: zip/app-e2eRelease-baseline.apk
+          app_file: zip/app-e2eRelease-main.apk
           app_type: ANDROID_APP
           test_type: APPIUM_NODE
           test_package_file: App.zip
           test_package_type: APPIUM_NODE_TEST_PACKAGE
-          test_spec_file: tests/e2e/TestSpec.yml
+          test_spec_file: tests/e2e/TestSpecMain.yml
           test_spec_type: APPIUM_NODE_TEST_SPEC
           remote_src: false
           file_artifacts: Customer Artifacts.zip
+          log_artifacts: debug.log
           cleanup: true
 
-      - name: Unzip AWS Device Farm results
-        if: ${{ always() }}
-        run: unzip "Customer Artifacts.zip"
-
-      - name: Print AWS Device Farm run results
-        if: ${{ always() }}
-        run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
-
-      - name: Print AWS Device Farm verbose run results
-        if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
-        run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
-
-# TODO: Once tests are more reliable we should uncomment this
-#      - name: Check if test failed, if so post the results and add the DeployBlocker label
-#        run: |
-#          if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
-#            gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
-#            gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
-#            gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
-#          else
-#            echo '✅ no performance regression detected'
-#          fi
-#        env:
-#          GITHUB_TOKEN: ${{ github.token }}
+      - name: Print logs if run failed
+        if: failure()
+        run: |
+          echo ${{ steps.schedule-awsdf-main.outputs.data }}
+          unzip "Customer Artifacts.zip" -d mainResults
+          cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log
+
+      - name: Unzip AWS Device Farm main results
+        run: unzip "Customer Artifacts.zip" -d mainResults
+
+      - name: Delete Customer Artifacts.zip
+        run: rm "Customer Artifacts.zip"
+
+      - name: Schedule AWS Device Farm test run on delta branch
+        uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+        with:
+          name: App E2E Performance Regression Tests
+          project_arn: ${{ secrets.AWS_PROJECT_ARN }}
+          device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
+          app_file: zip/app-e2eRelease-delta.apk
+          app_type: ANDROID_APP
+          test_type: APPIUM_NODE
+          test_package_file: App.zip
+          test_package_type: APPIUM_NODE_TEST_PACKAGE
+          test_spec_file: tests/e2e/TestSpecDelta.yml
+          test_spec_type: APPIUM_NODE_TEST_SPEC
+          remote_src: false
+          file_artifacts: Customer Artifacts.zip
+          cleanup: true
+
+      - name: Unzip AWS Device Farm delta results
+        run: unzip "Customer Artifacts.zip" -d deltaResults
+
+      - name: Compare results
+        run: node tests/e2e/merge.js --mainPath ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/main.json --deltaPath ./deltaResults//Host_Machine_Files/\$WORKING_DIRECTORY/delta.json --outputPath ./output.md
+
+      - name: Print results
+        run: cat "./output.md"
+
+      - name: Check if test failed, if so post the results and add the DeployBlocker label
+        run: |
+          if grep -q '🔴' ./output.md; then
+            gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
+            gh pr comment ${{ inputs.PR_NUMBER }} -F ./output.md
+            gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
+          else
+            echo '✅ no performance regression detected'
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/imgbot.yml

@@ -0,0 +1,25 @@
+name: imgbot Image Optimization
+
+on: pull_request
+
+permissions:
+  pull-requests: write
+  # The two permissions below are supposedly needed to allow a pull request to be merged.
+  # See https://github.com/cli/cli/discussions/6379
+  issues: write
+  contents: write
+
+jobs:
+  approveAndMerge:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'imgbot[bot]' }}
+    steps:
+      - name: Approve imgbot PR
+        run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Merge imgbot PR
+        run: gh pr merge --auto --merge "${{ github.event.pull_request.html_url }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -5,14 +5,15 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
+    paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 jobs:
   lint:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@v3
 
       - name: Setup Node
         uses: Expensify/App/.github/actions/composite/setupNode@main
@@ -22,9 +23,6 @@ jobs:
         env:
           CI: true
 
-      - name: Lint shell scripts with ShellCheck
-        run: npm run shellcheck
-
       - name: Verify there's no Prettier diff
         run: |
           npm run prettier -- --loglevel silent

.github/workflows/platformDeploy.yml

@@ -67,7 +67,7 @@ jobs:
         uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -178,7 +178,7 @@ jobs:
     name: Build and deploy iOS
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-12-xl
+    runs-on: macos-13-xlarge
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -190,7 +190,7 @@ jobs:
         uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
         with:
           ruby-version: '2.7'
           bundler-cache: true