Merge branch 'ci/e2e-test-run-failure' into vit-copy50582

Expensify · Oct 10, 2024 · 23911dc · 23911dc
2 parents da700c5 + b5dee21
commit 23911dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
@@ -20,11 +20,18 @@ on:
         description: The pull request number associated with this build, if relevant.
         type: string
         required: false
+      artifact-apk-name:
+        description: The name of the APK artifact to upload
+        type: string
+        required: false
+        default: ${{ inputs.artifact-prefix }}android-artifact-apk
     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: ${{ inputs.artifact-apk-name }}
 
   workflow_dispatch:
     inputs:
@@ -174,7 +181,7 @@ jobs:
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.artifact-prefix }}android-artifact-apk
+          name: ${{ inputs.artifact-apk-name }}
           path: ${{ steps.build.outputs.APK_PATH }}
 
       - name: Upload Android sourcemaps artifact

diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
@@ -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