Merge remote-tracking branch 'expensify/main' into from-migration/roo…

…m-name-page

.github/actionlint.yaml

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

.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/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/platformDeploy.yml

@@ -139,7 +139,7 @@ jobs:
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-13-xlarge
+    runs-on: macos-12-xl
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/preDeploy.yml

@@ -140,7 +140,7 @@ jobs:
   newContributorWelcomeMessage:
     runs-on: ubuntu-latest
     needs: isExpensifyEmployee
-    if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }}
+    if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && github.actor != 'imgbot[bot]' }}
     steps:
       # Version: 2.3.4
       - name: Checkout

.github/workflows/reviewerChecklist.yml

@@ -7,7 +7,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: reviewerChecklist.js
         uses: Expensify/App/.github/actions/javascript/reviewerChecklist@main

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   jest:
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     env:
       CI: true
@@ -39,7 +39,7 @@ jobs:
         run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   storybookTests:
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     name: Storybook tests
     steps:
@@ -51,7 +51,7 @@ jobs:
         run: npm run storybook -- --smoke-test --ci
 
   shellTests:
-    if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     name: Shell tests
     steps:

.github/workflows/testBuild.yml

@@ -218,7 +218,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-13-xlarge
+    runs-on: macos-12-xl
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/validateDocsRoutes.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   verify:
-    if: github.actor != 'OSBotify'
+    if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

.github/workflows/validateGithubActions.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   verify:
-    if: github.actor != 'OSBotify'
+    if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/verifyPodfile.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   verify:
-    if: github.actor != 'OSBotify'
+    if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
     runs-on: macos-latest
     steps:
       - name: Checkout

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001039002
-        versionName "1.3.90-2"
+        versionCode 1001039106
+        versionName "1.3.91-6"
     }
 
     flavorDimensions "default"