Merge branch 'Expensify:main' into hotfix-fab-1

Author: adhorodyski

.github/actions/javascript/markPullRequestsAsDeployed/action.yml

@@ -32,6 +32,12 @@ inputs:
     NOTE:
         description: "Additional note from the deployer"
         required: false
+    ANDROID_SENTRY_URL:
+        description: "URL to Sentry size analysis for Android"
+        required: false
+    IOS_SENTRY_URL:
+        description: "URL to Sentry size analysis for iOS"
+        required: false
 runs:
     using: "node20"
     main: "./index.js"

.github/actions/javascript/markPullRequestsAsDeployed/index.js

@@ -12844,6 +12844,8 @@ async function run() {
     const webResult = getDeployTableMessage(core.getInput('WEB', { required: true }));
     const date = core.getInput('DATE');
     const note = core.getInput('NOTE');
+    const androidSentryUrl = core.getInput('ANDROID_SENTRY_URL');
+    const iosSentryUrl = core.getInput('IOS_SENTRY_URL');
     function getDeployMessage(deployer, deployVerb) {
         let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
         message += ` by https://github.com/${deployer} in version: ${version} `;
@@ -12857,6 +12859,15 @@ async function run() {
         if (note) {
             message += `\n\n_Note:_ ${note}`;
         }
+        if (androidSentryUrl || iosSentryUrl) {
+            message += `\n\n**Bundle Size Analysis (Sentry):**`;
+            if (androidSentryUrl) {
+                message += `\n- [Android](${androidSentryUrl})`;
+            }
+            if (iosSentryUrl) {
+                message += `\n- [iOS](${iosSentryUrl})`;
+            }
+        }
         return message;
     }
     if (isProd) {

.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts

@@ -108,6 +108,8 @@ async function run() {
 
     const date = core.getInput('DATE');
     const note = core.getInput('NOTE');
+    const androidSentryUrl = core.getInput('ANDROID_SENTRY_URL');
+    const iosSentryUrl = core.getInput('IOS_SENTRY_URL');
 
     function getDeployMessage(deployer: string, deployVerb: string): string {
         let message = `🚀 [${deployVerb}](${workflowURL}) to ${isProd ? 'production' : 'staging'}`;
@@ -124,6 +126,16 @@ async function run() {
             message += `\n\n_Note:_ ${note}`;
         }
 
+        if (androidSentryUrl || iosSentryUrl) {
+            message += `\n\n**Bundle Size Analysis (Sentry):**`;
+            if (androidSentryUrl) {
+                message += `\n- [Android](${androidSentryUrl})`;
+            }
+            if (iosSentryUrl) {
+                message += `\n- [iOS](${iosSentryUrl})`;
+            }
+        }
+
         return message;
     }
 

.github/workflows/buildAndroid.yml

@@ -35,6 +35,9 @@ on:
       ROCK_ARTIFACT_URL:
         description: URL to download the ad-hoc build artifact (adhoc only)
         value: ${{ jobs.build.outputs.ROCK_ARTIFACT_URL }}
+      SENTRY_URL:
+        description: URL to Sentry size analysis
+        value: ${{ jobs.build.outputs.SENTRY_URL }}
       AAB_FILENAME:
         description: Filename of the AAB artifact (empty if no AAB was produced)
         value: ${{ jobs.build.outputs.AAB_FILENAME }}
@@ -57,6 +60,7 @@ jobs:
     outputs:
       VERSION_CODE: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }}
       ROCK_ARTIFACT_URL: ${{ steps.set-artifact-url.outputs.ARTIFACT_URL }}
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
       AAB_FILENAME: ${{ steps.collectArtifacts.outputs.AAB_FILENAME }}
       APK_FILENAME: ${{ steps.collectArtifacts.outputs.APK_FILENAME }}
       SOURCEMAP_FILENAME: index.android.bundle.map
@@ -185,6 +189,27 @@ jobs:
           custom-identifier: ${{ steps.computeIdentifier.outputs.IDENTIFIER }}
           validate-elf-alignment: ${{ inputs.variant != 'Release' && 'true' || 'false' }}
 
+      - name: Set artifact URL output
+        id: set-artifact-url
+        if: ${{ inputs.variant == 'Adhoc' }}
+        run: echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT"
+
+      - name: Upload Android build to Sentry for size analysis
+        id: sentry-upload
+        if: ${{ inputs.variant == 'Release' && env.ARTIFACT_PATH != '' }}
+        continue-on-error: true
+        timeout-minutes: 5
+        run: |
+          OUTPUT=$(npx sentry-cli build upload "$ARTIFACT_PATH" --org expensify --project app --build-configuration Release --log-level debug 2>&1)
+          echo "$OUTPUT"
+          SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ ]+' | head -1)
+          if [ -n "$SENTRY_URL" ]; then
+            echo "::notice::Android Sentry size analysis: $SENTRY_URL"
+            echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+
       - name: Upload Gradle profile report
         if: always()
         # v6
@@ -194,11 +219,6 @@ jobs:
           path: Mobile-Expensify/Android/build/reports/profile/
           if-no-files-found: ignore
 
-      - name: Set artifact URL output
-        id: set-artifact-url
-        if: ${{ inputs.variant == 'Adhoc' }}
-        run: echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT"
-
       - name: Collect build artifacts
         id: collectArtifacts
         run: |
@@ -294,3 +314,4 @@ jobs:
         with:
           name: ${{ inputs.artifact-prefix }}android-apk-artifact
           path: Expensify.apk
+

.github/workflows/buildIOS.yml

@@ -35,6 +35,9 @@ on:
       ROCK_ARTIFACT_URL:
         description: URL to download the ad-hoc build artifact (adhoc only)
         value: ${{ jobs.build.outputs.ROCK_ARTIFACT_URL }}
+      SENTRY_URL:
+        description: URL to Sentry size analysis
+        value: ${{ jobs.build.outputs.SENTRY_URL }}
       IPA_FILENAME:
         description: Filename of the IPA artifact produced by the build
         value: ${{ jobs.build.outputs.IPA_FILENAME }}
@@ -55,6 +58,7 @@ jobs:
     outputs:
       IOS_VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }}
       ROCK_ARTIFACT_URL: ${{ steps.set-artifact-url.outputs.ARTIFACT_URL }}
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
       IPA_FILENAME: ${{ steps.set-ipa-filename.outputs.IPA_FILENAME }}
       DSYM_FILENAME: ${{ steps.set-ipa-filename.outputs.DSYM_FILENAME }}
       SOURCEMAP_FILENAME: main.jsbundle.map
@@ -241,6 +245,22 @@ jobs:
           comment-bot: false
           custom-identifier: ${{ steps.computeIdentifier.outputs.IDENTIFIER }}
 
+      - name: Upload iOS build to Sentry for size analysis
+        id: sentry-upload
+        if: ${{ inputs.variant == 'Release' && env.ARTIFACT_PATH != '' }}
+        continue-on-error: true
+        timeout-minutes: 5
+        run: |
+          OUTPUT=$(npx sentry-cli build upload "$ARTIFACT_PATH" --org expensify --project app --build-configuration Release --log-level debug 2>&1)
+          echo "$OUTPUT"
+          SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ ]+' | head -1)
+          if [ -n "$SENTRY_URL" ]; then
+            echo "::notice::iOS Sentry size analysis: $SENTRY_URL"
+            echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+
       - name: Set artifact URL output
         id: set-artifact-url
         if: ${{ inputs.variant == 'Adhoc' }}
@@ -304,3 +324,4 @@ jobs:
         with:
           name: ${{ inputs.artifact-prefix }}ios-sourcemap-artifact
           path: Mobile-Expensify/main.jsbundle.map
+

.github/workflows/deploy.yml

@@ -912,11 +912,13 @@ jobs:
   postGithubComments:
     uses: ./.github/workflows/postDeployComments.yml
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
-    needs: [prep, checkDeploymentSuccess, createRelease]
+    needs: [prep, checkDeploymentSuccess, createRelease, androidBuild, iosBuild]
     secrets: inherit
     with:
       version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }}
       android: ${{ needs.checkDeploymentSuccess.outputs.ANDROID_RESULT }}
       ios: ${{ needs.checkDeploymentSuccess.outputs.IOS_RESULT }}
       web: ${{ needs.checkDeploymentSuccess.outputs.WEB_RESULT }}
+      android_sentry_url: ${{ needs.androidBuild.outputs.SENTRY_URL }}
+      ios_sentry_url: ${{ needs.iosBuild.outputs.SENTRY_URL }}

.github/workflows/postDeployComments.yml

@@ -23,6 +23,14 @@ on:
         description: Web deploy status
         required: true
         type: string
+      android_sentry_url:
+        description: URL to Sentry size analysis for Android
+        required: false
+        type: string
+      ios_sentry_url:
+        description: URL to Sentry size analysis for iOS
+        required: false
+        type: string
     secrets:
       OS_BOTIFY_TOKEN:
         description: Token for accessing Mobile-Expensify repository
@@ -109,3 +117,5 @@ jobs:
           WEB: ${{ inputs.web }}
           DATE: ${{ inputs.date }}
           NOTE: ${{ inputs.note }}
+          ANDROID_SENTRY_URL: ${{ inputs.android_sentry_url }}
+          IOS_SENTRY_URL: ${{ inputs.ios_sentry_url }}