From ae4120d953372e29d34c9bb3b9b309503a80cbda Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Thu, 7 Dec 2023 21:43:55 +0100
Subject: [PATCH] Remove slashes from AWS Device Farm uploads (#1930)

---
 .github/actions/aws-device-farm-run/action.yml |  2 +-
 .github/workflows/android-ci.yml               | 12 ++++++++----
 .github/workflows/android-device-test.yml      |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/actions/aws-device-farm-run/action.yml b/.github/actions/aws-device-farm-run/action.yml
index fc1d1814d..9edc0054c 100644
--- a/.github/actions/aws-device-farm-run/action.yml
+++ b/.github/actions/aws-device-farm-run/action.yml
@@ -112,7 +112,7 @@ runs:
             --app-arn ${{ env.app_arn }} \
             --device-pool-arn ${{ inputs.AWS_DEVICE_FARM_DEVICE_POOL_ARN }} \
             --test type=${{ inputs.testType }},testPackageArn=${{ env.test_package_arn }}${{ inputs.testFilter && ',filter=' }}${{ inputs.testFilter }} \
-            --execution-configuration jobTimeoutMinutes=28800,videoCapture=false \
+            --execution-configuration jobTimeoutMinutes=480,videoCapture=false \
             ${{ inputs.externalData && '--configuration extraDataPackageArn=' }}${{ inputs.externalData }} \
             --output text --query "run.arn")"
           
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index b885990ac..724242f1f 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -118,19 +118,23 @@ jobs:
             echo "No secrets.MAPLIBRE_DEVELOPER_CONFIG_XML variable set, not copying..."
           fi
 
-      - name: Build Benchmark
+      - name: Build Benchmark, copy to platform/android
         if: github.ref != 'refs/heads/main'
         run: |
           ./gradlew assembleDrawableRelease assembleDrawableReleaseAndroidTest
+          cp MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk .
+          cp MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk .
 
-      - uses: actions/upload-artifact@v3
+
+      - name: Create artifact for benchmark APKs 
+        uses: actions/upload-artifact@v3
         if: github.ref != 'refs/heads/main'
         with:
           if-no-files-found: error
           name: benchmarkAPKs
           path: |
-            platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk
-            platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk
+            platform/android/MapboxGLAndroidSDKTestApp-drawable-release.apk
+            platform/android/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk
 
       - name: Build UI tests
         if: github.ref == 'refs/heads/main'
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 6b7d1d65f..7f4c2ce73 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -14,8 +14,8 @@ jobs:
           {artifactName: android-render-tests, testFile: RenderTests.apk, appFile: RenderTestsApp.apk, name: "Android Render Tests"},
           {
             artifactName: benchmarkAPKs,
-            testFile: "androidTest/drawable/release/MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk",
-            appFile: "drawable/release/MapboxGLAndroidSDKTestApp-drawable-release.apk",
+            testFile: "MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk",
+            appFile: "MapboxGLAndroidSDKTestApp-drawable-release.apk",
             name: "Android Benchmark",
             testFilter: "org.maplibre.android.benchmark.Benchmark",
             # echo '{"styleNames": [...], "styleURLs": [...], "resultsAPI: "..." }' > benchmark-input.json