Merge branch 'main' into andrew-hybrid-build-follow-ups

Author: AndrewGable

.github/workflows/compareNDandODbuilds.yml

@@ -0,0 +1,107 @@
+name: Build and profile Android apps
+
+on:
+  workflow_dispatch:
+
+jobs:
+  validateActor:
+    runs-on: ubuntu-latest
+    outputs:
+      READY_TO_BUILD: ${{ fromJSON(steps.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && fromJSON(steps.hasReadyToBuildLabel.outputs.HAS_READY_TO_BUILD_LABEL) }}
+    steps:
+      - name: Is Expensify employee
+        id: isExpensifyEmployee
+        run: |
+          if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ github.actor }} --silent; then
+            echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "IS_EXPENSIFY_EMPLOYEE=false" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - id: hasReadyToBuildLabel
+        name: Set HAS_READY_TO_BUILD_LABEL flag
+        run: |
+          echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view "${{ env.PULL_REQUEST_NUMBER }}" --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
+          if [[ "$HAS_READY_TO_BUILD_LABEL" != 'true' ]]; then
+            echo "The 'Ready to Build' label is not attached to the PR #${{ env.PULL_REQUEST_NUMBER }}"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+  buildHybridAppAndroid:
+    name: Build HybridApp Android
+    needs: [validateActor]
+    runs-on: macos-15-xlarge
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          ref: ${{ github.event.pull_request.head.sha }}
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Update submodule to match main
+        run: |
+          git submodule update --init --remote
+          cd Mobile-Expensify
+          git fetch
+          git checkout main
+
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: 'true'
+
+      - name: Build Android Release
+        working-directory: Mobile-Expensify/Android
+        run: |
+          if ! ./gradlew --profile assembleRelease
+          then
+            echo "❌ Android HybridApp failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
+            exit 1
+          else
+            echo "✅ Build succeeded. Printing Gradle profile report:"
+            # Print the latest generated profile report
+            PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
+            cat "$PROFILE_REPORT"
+          fi
+
+  buildStandaloneAndroid:
+    name: Build Standalone Android
+    needs: [ validateActor ]
+    runs-on: macos-15-xlarge
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Configure MapBox SDK
+        run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+
+      - name: Setup Node
+        id: setup-node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: 'false'
+
+      - name: Build Android Release
+        working-directory: android
+        run: |
+          if ! ./gradlew --profile assembleProductionRelease
+          then
+            echo "❌ Android Standalone failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
+            exit 1
+          else
+            echo "✅ Build succeeded. Printing Gradle profile report:"
+            # Print the latest generated profile report
+            PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
+            cat "$PROFILE_REPORT"
+          fi

.github/workflows/testBuildHybrid.yml

@@ -77,7 +77,7 @@ jobs:
             const pullRequest = await github.rest.pulls.get({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              pull_number: '${{ env.PULL_REQUEST_NUMBER }}'',
+              pull_number: '${{ env.PULL_REQUEST_NUMBER }}',
             });
             
             const body = pullRequest.data.body;
@@ -89,7 +89,6 @@ jobs:
   getOldDotBranchRef:
       runs-on: ubuntu-latest
       needs: getOldDotPR
-      if: ${{ needs.getOldDotPR.outputs.OLD_DOT_PR != '' }}
       outputs:
         OLD_DOT_REF: ${{ steps.getHeadRef.outputs.REF }}
       steps:
@@ -100,9 +99,13 @@ jobs:
           id: getHeadRef
           run: |
             set -e
-            echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} -R 'Expensify/Mobile-Expensify' --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+            if [[ ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} == '' ]]; then
+              echo "REF=" >> "$GITHUB_OUTPUT"
+            else
+              echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} -R Expensify/Mobile-Expensify --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+            fi
           env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
 
   postGitHubCommentBuildStarted:
@@ -148,7 +151,7 @@ jobs:
         if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
         run: |
           cd Mobile-Expensify
-          git fetch
+          git fetch origin ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
           git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
       
       - name: Configure MapBox SDK
@@ -259,7 +262,7 @@ jobs:
         if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
         run: |
           cd Mobile-Expensify
-          git fetch
+          git fetch origin ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
           git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
 
       - name: Configure MapBox SDK
@@ -311,9 +314,9 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op document get --output ./OldApp_AdHoc.mobileprovision OldApp_AdHoc
-          op document get --output ./OldApp_AdHoc_Share_Extension.mobileprovision OldApp_AdHoc_Share_Extension
-          op document get --output ./OldApp_AdHoc_Notification_Service.mobileprovision OldApp_AdHoc_Notification_Service
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc/OldApp_AdHoc.mobileprovision --force --out-file ./OldApp_AdHoc.mobileprovision
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc_Share_Extension/OldApp_AdHoc_Share_Extension.mobileprovision --force --out-file ./OldApp_AdHoc_Share_Extension.mobileprovision
+          op read op://Mobile-Deploy-CI/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
 
       - name: Decrypt certificate
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output Certificates.p12 Certificates.p12.gpg