Merge branch 'main' into fix/49106

.github/ISSUE_TEMPLATE/Standard.md

@@ -10,6 +10,7 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
+**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
 **If this was caught during regression testing, add the test name, ID and link from TestRail:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -34,9 +35,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
 Check off any platforms that are affected by this issue
 --->
 Which of our officially supported platforms is this issue occurring on?
-- [ ] Android: Native
+- [ ] Android: Standalone
+- [ ] Android: HybridApp
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Native
+- [ ] iOS: Standalone
+- [ ] iOS: HybridApp
 - [ ] iOS: mWeb Safari
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop

.github/workflows/buildAndroid.yml

@@ -20,11 +20,14 @@ on:
         description: The pull request number associated with this build, if relevant.
         type: string
         required: false
+
     outputs:
       AAB_FILE_NAME:
         value: ${{ jobs.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME:
         value: ${{ jobs.build.outputs.APK_FILE_NAME }}
+      APK_ARTIFACT_NAME:
+        value: ${{ jobs.build.outputs.APK_ARTIFACT_NAME }}
 
   workflow_dispatch:
     inputs:
@@ -56,6 +59,7 @@ jobs:
     outputs:
       AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}
+      APK_ARTIFACT_NAME: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}
 
     steps:
       - name: Checkout
@@ -118,42 +122,49 @@ jobs:
             } >> "$envFile"
           fi
 
-      - name: Build Android app
+      - name: Build Android app (retryable)
+        uses: nick-fields/retry@v3
         id: build
-        run: |
-          lane=''
-          case '${{ inputs.type }}' in
-            'release')
-              lane='build';;
-            'adhoc')
-              lane='build_adhoc';;
-            'e2e')
-              lane='build_e2e';;
-            'e2eDelta')
-              lane='build_e2eDelta';;
-          esac
-          bundle exec fastlane android "$lane"
-
-          # Refresh environment variables from GITHUB_ENV that are updated when running fastlane
-          # shellcheck disable=SC1090
-          source "$GITHUB_ENV"
-
-          SHOULD_UPLOAD_SOURCEMAPS='false'
-          if [ -f ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map ]; then
-            SHOULD_UPLOAD_SOURCEMAPS='true'
-          fi
-
-          {
-            # aabPath and apkPath are environment varibles set within the Fastfile
-            echo "AAB_PATH=$aabPath"
-            echo "AAB_FILE_NAME=$(basename "$aabPath")"
-            echo "APK_PATH=$apkPath"
-            echo "APK_FILE_NAME=$(basename "$apkPath")"
-            echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
-          } >> "$GITHUB_OUTPUT"
         env:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
+        with:
+          retry_on: error
+          retry_wait_seconds: 60
+          timeout_minutes: 60
+          max_attempts: 3
+          command: |
+            lane=''
+            case '${{ inputs.type }}' in
+              'release')
+                lane='build';;
+              'adhoc')
+                lane='build_adhoc';;
+              'e2e')
+                lane='build_e2e';;
+              'e2eDelta')
+                lane='build_e2eDelta';;
+            esac
+            bundle exec fastlane android "$lane"
+
+            # Refresh environment variables from GITHUB_ENV that are updated when running fastlane
+            # shellcheck disable=SC1090
+            source "$GITHUB_ENV"
+
+            SHOULD_UPLOAD_SOURCEMAPS='false'
+            if [ -f ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map ]; then
+              SHOULD_UPLOAD_SOURCEMAPS='true'
+            fi
+
+            {
+              # aabPath and apkPath are environment varibles set within the Fastfile
+              echo "AAB_PATH=$aabPath"
+              echo "AAB_FILE_NAME=$(basename "$aabPath")"
+              echo "APK_PATH=$apkPath"
+              echo "APK_FILE_NAME=$(basename "$apkPath")"
+              echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
+              echo "APK_ARTIFACT_NAME=${{ inputs.artifact-prefix }}android-artifact-apk" >> "$GITHUB_OUTPUT"
+            } >> "$GITHUB_OUTPUT"    
 
       - name: Upload Android AAB artifact
         if: ${{ steps.build.outputs.AAB_PATH != '' }}
@@ -168,7 +179,7 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.artifact-prefix }}android-artifact-apk
+          name: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}
           path: ${{ steps.build.outputs.APK_PATH }}
 
       - name: Upload Android sourcemaps artifact

.github/workflows/cla.yml

@@ -4,39 +4,9 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA:
-    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' && github.event.pull_request.user.login != 'imgbot[bot]') }}
-    steps:
-        - name: CLA comment check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: sign
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - name: CLA comment re-check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: recheck
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*recheck\s*'
-        - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
-          # Version: 2.1.2-beta
-          uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOTIFY_TOKEN }}
-          with:
-              path-to-signatures: '${{ github.repository }}/cla.json'
-              path-to-document: 'https://github.com/${{ github.repository }}/blob/main/contributingGuides/CLA.md'
-              branch: 'main'
-              remote-organization-name: 'Expensify'
-              remote-repository-name: 'CLA'
-              lock-pullrequest-aftermerge: false
-              allowlist: OSBotify,snyk-bot
+    uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
+    secrets: inherit

.github/workflows/deployBlocker.yml

@@ -29,23 +29,6 @@ jobs:
           escaped_title=$(echo "$GH_ISSUE_TITLE" | sed -e 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g; s/"/\&quot;/g; s/'"'"'/\&#039;/g; s/|/\&verbar;/g')
           echo "GH_ISSUE_TITLE=$escaped_title" >> "$GITHUB_ENV"
 
-      - name: 'Post the issue in the #expensify-open-source slack room'
-        if: ${{ success() }}
-        uses: 8398a7/action-slack@v3
-        with:
-          status: custom
-          custom_payload: |
-            {
-              channel: '#expensify-open-source',
-              attachments: [{
-                color: "#DB4545",
-                text: '💥 New Deploy Blocker: <${{ github.event.issue.html_url }}|${{ env.GH_ISSUE_TITLE }}>. If you have any idea which PR could be causing this, please comment in the issue.'
-              }]
-            }
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
       - name: Comment on deploy blocker
         run: |
           gh issue comment ${{ github.event.issue.number }} --body "$(cat <<'EOF'

.github/workflows/e2ePerformanceTests.yml

@@ -46,7 +46,7 @@ jobs:
         uses: ./.github/actions/javascript/getArtifactInfo
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
-          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}-android-artifact-apk
+          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk
 
       - name: Skip build if there's already an existing artifact for the baseline
         if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}
@@ -125,7 +125,7 @@ jobs:
         uses: actions/download-artifact@v4
         id: downloadBaselineAPK
         with:
-          name: baseline-${{ needs.prep.outputs.BASELINE_VERSION }}-android-artifact-apk
+          name: ${{ needs.buildBaseline.outputs.APK_ARTIFACT_NAME }}
           path: zip
           # Set github-token only if the baseline was built in this workflow run:
           github-token: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID && github.token }}
@@ -139,7 +139,7 @@ jobs:
         uses: actions/download-artifact@v4
         id: downloadDeltaAPK
         with:
-          name: delta-${{ needs.prep.outputs.DELTA_REF }}-android-artifact-apk
+          name: ${{ needs.buildDelta.outputs.APK_ARTIFACT_NAME }}
           path: zip
 
       - name: Rename delta APK

android/app/build.gradle

@@ -13,7 +13,7 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
 /* Fullstory settings */
 fullstory {
     org 'o-1WN56P-na1'
-    enabledVariants 'all'
+    enabledVariants 'production'
     logcatLevel 'debug'
     recordOnStart false
 }
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004604
-        versionName "9.0.46-4"
+        versionCode 1009005101
+        versionName "9.0.51-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/build.gradle

@@ -42,12 +42,6 @@ allprojects {
     configurations.all {
         resolutionStrategy {
             force 'org.xerial:sqlite-jdbc:3.34.0'
-
-            // Manually set the react-native version to resolve this upstream issue: https://github.com/facebook/react-native/issues/35210
-            def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
-            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
-            force "com.facebook.react:hermes-engine:" + REACT_NATIVE_VERSION
-
             //Fix Investigate App Crash MainActivity.onCreate #35655
             force "com.facebook.soloader:soloader:0.10.4+"