From 407c96faac631a28a6e2f48251182690f0696420 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sat, 12 Nov 2022 09:55:29 +0100
Subject: [PATCH 1/2] Gradle Managed Devices

https://developer.android.com/studio/test/gradle-managed-devices
---
 .github/workflows/pull-request.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 31d1175..24a7951 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -47,11 +47,17 @@ jobs:
       - name: Run instrumentation tests
         uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7
         with:
-          cmd: ./gradlew cAT --continue
-          api: ${{ matrix.api }}
-          tag: ${{ matrix.tag }}
-          abi: ${{ matrix.abi }}
-          cmdOptions: -noaudio -no-boot-anim -no-window
+          cmd: ./gradlew nexusOneApi30DebugAndroidTest
+#          api: ${{ matrix.api }}
+#          tag: ${{ matrix.tag }}
+#          abi: ${{ matrix.abi }}
+#          cmdOptions: -noaudio -no-boot-anim -no-window
+      - name: Archive Espresso report
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: Moka-Espresso-report-${{ matrix.api }}-${{ matrix.abi }}-report
+          path: sample/build/reports/androidTests/connected
       - name: Archive Espresso results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

From 89a16ee40b42d339bff19412867c3b912fdf7494 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Sat, 12 Nov 2022 20:11:04 +0100
Subject: [PATCH 2/2] Next try

---
 .github/workflows/pull-request.yml | 36 +++++++-----------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 24a7951..32fa623 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -14,17 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        api: [ 28 ]
-        abi: [ x86_64 ]
-        tag: [ 'default' ]
-        include:
-          #          - api: 31
-          #            abi: x86_64
-          #            tag: 'google_apis'
-          - os: ubuntu-latest
-            api: 30
-            abi: x86_64
-            tag: 'google_apis'
     steps:
       - name: kvm support
         run: |
@@ -40,35 +29,26 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: 17
-      - name: Install Android SDK
-        uses: hannesa2/action-android/install-sdk@0.1.16.7
-      - name: Build project
-        run: ./gradlew assemble
-      - name: Run instrumentation tests
-        uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7
-        with:
-          cmd: ./gradlew nexusOneApi30DebugAndroidTest
-#          api: ${{ matrix.api }}
-#          tag: ${{ matrix.tag }}
-#          abi: ${{ matrix.abi }}
-#          cmdOptions: -noaudio -no-boot-anim -no-window
+      - uses: hannesa2/action-android/install-sdk@0.1.16.7
+      - run: sdkmanager platform-tools
+      - run: ./gradlew nexusOneApi30DebugAndroidTest
       - name: Archive Espresso report
         if: ${{ always() }}
         uses: actions/upload-artifact@v3
         with:
-          name: Moka-Espresso-report-${{ matrix.api }}-${{ matrix.abi }}-report
+          name: Moka-Espresso-report
           path: sample/build/reports/androidTests/connected
       - name: Archive Espresso results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: Moka-Espresso-${{ matrix.api }}-${{ matrix.abi }}-report
-          path: sample/build/reports/androidTests/connected
+          name: Moka-Espresso-result
+          path: sample/build/outputs/androidTest-results/managedDevice
       - name: Archive screenshots
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: Moka-Screenshots-${{ matrix.api }}-${{ matrix.abi }}-report
+          name: Moka-Screenshots
           path: |
             sample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
             sample/build/outputs/androidTest-results/connected
@@ -82,7 +62,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
-      - name: Install JDK ${{ matrix.java_version }}
+      - name: Install JDK
         uses: actions/setup-java@v5
         with:
           distribution: 'adopt'