merge main

Author: borys3kk

.github/actions/composite/uploadSentrySizeAnalysis/action.yml

@@ -0,0 +1,71 @@
+name: Upload build to Sentry for size analysis
+description: |
+  Download a platform binary and upload it to Sentry for size analysis. The binary is sourced
+  from either the current workflow run's artifacts (cherry-pick prod deploys, which build natively)
+  or the matching staging GitHub Release (re-promotion prod deploys, which do not build natively).
+
+inputs:
+  platform:
+    description: "Platform label used in the GH Actions notice (e.g. 'Android' or 'iOS')"
+    required: true
+  asset-name:
+    description: "Filename of the binary on disk and as the GH Release asset (e.g. 'Expensify-release.aab')"
+    required: true
+  artifact-name:
+    description: "Name of the GH Actions artifact to download for cherry-pick deploys (e.g. 'androidBuild-artifact')"
+    required: true
+  staging-release-tag:
+    description: "Tag of the staging GH Release to download from for re-promotion deploys (e.g. '9.4.13-0-staging')"
+    required: true
+  is-cherry-pick:
+    description: "'true' when this deploy is a cherry-pick (binary is in the current run); 'false' otherwise (binary is on the staging release)"
+    required: true
+
+outputs:
+  SENTRY_URL:
+    description: URL to the Sentry size analysis for the uploaded build (empty if upload failed or quota exhausted)
+    value: ${{ steps.upload.outputs.SENTRY_URL }}
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Node
+      uses: ./.github/actions/composite/setupNode
+
+    - name: Download binary from current workflow run (cherry-pick path)
+      if: ${{ inputs.is-cherry-pick == 'true' }}
+      continue-on-error: true
+      # v7
+      uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
+      with:
+        name: ${{ inputs.artifact-name }}
+        path: ./
+
+    - name: Download binary from the staging GitHub Release (re-promotion path)
+      if: ${{ inputs.is-cherry-pick != 'true' }}
+      continue-on-error: true
+      shell: bash
+      env:
+        TAG: ${{ inputs.staging-release-tag }}
+        ASSET: ${{ inputs.asset-name }}
+      run: |
+        gh release download "$TAG" --pattern "$ASSET" --output "$ASSET"
+        [ -s "$ASSET" ] || { echo "::error::Failed to obtain $ASSET from $TAG"; exit 1; }
+
+    - name: Upload to Sentry
+      id: upload
+      if: ${{ hashFiles(inputs.asset-name) != '' }}
+      continue-on-error: true
+      shell: bash
+      env:
+        ASSET: ${{ inputs.asset-name }}
+        PLATFORM: ${{ inputs.platform }}
+      run: |
+        OUTPUT=$(npx sentry-cli build upload "$ASSET" \
+          --org expensify --project app --build-configuration Release --log-level info 2>&1)
+        echo "$OUTPUT"
+        SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ )"}]+' | head -1)
+        if [ -n "$SENTRY_URL" ]; then
+          echo "::notice::${PLATFORM} Sentry size analysis: $SENTRY_URL"
+          echo "SENTRY_URL=$SENTRY_URL" >> "$GITHUB_OUTPUT"
+        fi

.github/workflows/buildAndroid.yml

@@ -35,9 +35,6 @@ 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 }}
@@ -60,7 +57,6 @@ 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
@@ -195,22 +191,6 @@ jobs:
         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

.github/workflows/buildIOS.yml

@@ -35,9 +35,6 @@ 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 }}
@@ -58,7 +55,6 @@ 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
@@ -244,22 +240,6 @@ 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' }}

.github/workflows/deploy.yml

@@ -999,6 +999,68 @@ jobs:
               }]
             }
 
+  # Upload the production-bound binary to Sentry for size analysis.
+  # - Cherry-pick deploys build native in this run, so we pull the .aab/.ipa from the build artifact.
+  # - Re-promotion deploys don't build native, so we download from the matching `<TAG>-staging`
+  #   GitHub Release populated during the staging deploy of that version.
+  androidUploadSentry:
+    name: Upload Android build to Sentry for size analysis
+    needs: [prep, androidBuild, checkDeploymentSuccess]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: >-
+      ${{ always()
+          && needs.prep.outputs.DEPLOY_ENV == 'production'
+          && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
+    continue-on-error: true
+    timeout-minutes: 10
+    outputs:
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
+    steps:
+      - name: Checkout
+        uses: useblacksmith/checkout@c9796daa2a4bdebdab5bd16be2c09a70cd4e1121 # v1
+
+      - name: Upload to Sentry for size analysis
+        id: sentry-upload
+        uses: ./.github/actions/composite/uploadSentrySizeAnalysis
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        with:
+          platform: Android
+          asset-name: Expensify-release.aab
+          artifact-name: androidBuild-artifact
+          staging-release-tag: ${{ needs.prep.outputs.TAG }}-staging
+          is-cherry-pick: ${{ needs.prep.outputs.IS_CHERRY_PICK }}
+
+  iosUploadSentry:
+    name: Upload iOS build to Sentry for size analysis
+    needs: [prep, iosBuild, checkDeploymentSuccess]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: >-
+      ${{ always()
+          && needs.prep.outputs.DEPLOY_ENV == 'production'
+          && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
+    continue-on-error: true
+    timeout-minutes: 10
+    outputs:
+      SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
+    steps:
+      - name: Checkout
+        uses: useblacksmith/checkout@c9796daa2a4bdebdab5bd16be2c09a70cd4e1121 # v1
+
+      - name: Upload to Sentry for size analysis
+        id: sentry-upload
+        uses: ./.github/actions/composite/uploadSentrySizeAnalysis
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        with:
+          platform: iOS
+          asset-name: Expensify.ipa
+          artifact-name: iosBuild-artifact
+          staging-release-tag: ${{ needs.prep.outputs.TAG }}-staging
+          is-cherry-pick: ${{ needs.prep.outputs.IS_CHERRY_PICK }}
+
   # Why is this necessary for CP-to-prod? Consider this scenario:
   #   1. You close a checklist and we create a new staging version `9.0.34-0` and a new checklist
   #   2. You then CP a PR to production, and in the process create `9.0.35-0`
@@ -1068,13 +1130,13 @@ jobs:
   postGithubComments:
     uses: ./.github/workflows/postDeployComments.yml
     if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
-    needs: [prep, checkDeploymentSuccess, createRelease, androidBuild, iosBuild]
+    needs: [prep, checkDeploymentSuccess, createRelease, androidBuild, iosBuild, androidUploadSentry, iosUploadSentry]
     secrets: inherit
     with:
       version: ${{ needs.prep.outputs.APP_VERSION }}
       env: ${{ needs.prep.outputs.DEPLOY_ENV }}
       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 }}
+      android_sentry_url: ${{ needs.androidUploadSentry.outputs.SENTRY_URL }}
+      ios_sentry_url: ${{ needs.iosUploadSentry.outputs.SENTRY_URL }}

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009041901
-        versionName "9.4.19-1"
+        versionCode 1009042000
+        versionName "9.4.20-0"
         // 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"