~

.github/workflows/main.yml

@@ -62,8 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [21, 28]
-        arch: [[x86, X86], [x86_64, X86_64]]
+        arch: [[16, x86, X86], [21, x86, X86], [28, x86_64, X86_64]]
 #        , [arm64-v8a, Arm64]
     steps:
       - name: checkout
@@ -85,7 +84,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-${{ matrix.api-level }}-${{ matrix.arch[0] }}
+          key: avd-${{ matrix.arch[0] }}-${{ matrix.arch[1] }}
 
       - name: Prepare thirdparty
         run: bash ./gradlew -b thirdparty_build.gradle downloadAndPatchDjvu downloadAndMakeMupdf
@@ -94,8 +93,8 @@ jobs:
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: ${{ matrix.api-level }}
-          arch: ${{ matrix.arch[0] }}
+          api-level: ${{ matrix.arch[0] }}
+          arch: ${{ matrix.arch[1] }}
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: false
@@ -105,10 +104,10 @@ jobs:
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: ${{ matrix.api-level }}
-          arch: ${{ matrix.arch[0] }}
+          api-level: ${{ matrix.arch[0] }}
+          arch: ${{ matrix.arch[1] }}
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           sdcard-path-or-size: 900M
-          script: ./gradlew connected${{ matrix.arch[1] }}DebugAndroidTest -Porion.CIBuild=true
+          script: ./gradlew connected${{ matrix.arch[2] }}DebugAndroidTest -Porion.CIBuild=true