Merge branch 'main' of https://github.com/Expensify/App into nikki-up…

…date-moneyrequest-category
DylanDylann · Jan 22, 2024 · ba4ce85 · ba4ce85
2 parents db1bbe7 + f3111a4
commit ba4ce85
Show file tree

Hide file tree

Showing 93 changed files with 2,072 additions and 47,551 deletions.
diff --git a/.github/actions/composite/buildAndroidAPKDelta/action.yml b/.github/actions/composite/buildAndroidAPKDelta/action.yml
diff --git a/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml b/...ions/composite/buildAndroidAPK/action.yml → ...s/composite/buildAndroidE2EAPK/action.yml
@@ -1,16 +1,35 @@
-name: Build an Android apk
+name: Build an Android apk for e2e tests
 description: Build an Android apk for an E2E test build and upload it as an artifact
 
 inputs:
   ARTIFACT_NAME:
     description: The name of the workflow artifact where the APK should be uploaded
     required: true
+  PACKAGE_SCRIPT_NAME:
+    description: The name of the npm script to run to build the APK
+    required: true
+  APP_OUTPUT_PATH:
+    description: The path to the built APK
+    required: true
+  MAPBOX_SDK_DOWNLOAD_TOKEN:
+    description: The token to use to download the MapBox SDK
+    required: true
 
 runs:
   using: composite
   steps:
+    - name: Configure MapBox SDK
+      run: ./scripts/setup-mapbox-sdk.sh ${{ inputs.MAPBOX_SDK_DOWNLOAD_TOKEN }}
+      shell: bash
+
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
+    - name: Setup Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: "oracle"
+        java-version: "17"
+
     - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
       with:
         ruby-version: "2.7"
@@ -19,11 +38,11 @@ runs:
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
 
     - name: Build APK
-      run: npm run android-build-e2e
+      run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
       shell: bash
 
     - name: Upload APK
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
+        path: ${{ inputs.APP_OUTPUT_PATH }}