Simplify matrix

TWiStErRob · Jul 9, 2023 · 091db67 · 091db67
1 parent 9a2064b
commit 091db67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 36 deletions.
diff --git a/.github/workflows/instrumentation-matrix.yml b/.github/workflows/instrumentation-matrix.yml
@@ -9,41 +9,13 @@ jobs:
     uses: ./.github/workflows/instrumentation.yml
     with:
       android-api: ${{ matrix.api }}
-      android-image-arch: ${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
-        #reason: string (unused)
-        #api: number
-        #image: string
-        #arch: string
-        include:
-          #- api: 15
-          #  image: default
-          #  arch: x86
-          #  reason: "minSdkVersion + 1"
-
-          #- api: 21
-          #  image: default
-          #  arch: x86_64
-          #  reason: "ART runtime"
-
-          - api: 23
-            image: default
-            arch: x86_64
-            reason: "Runtime permissions"
-
-          - api: 29
-            image: default
-            arch: x86_64
-            reason: "latest 'default'"
-
-          #- api: 32
-          #  image: google_apis
-          #  arch: x86_64
-          #  reason: "targetSdkVersion"
-
-          #- api: 33
-          #  image: google_apis
-          #  arch: x86_64
-          #  reason: "compileSdkVersion"
+        api:
+          #- 15
+          #- 21
+          - 23
+          - 29
+          #- 32
+          #- 33
diff --git a/.github/workflows/instrumentation.yml b/.github/workflows/instrumentation.yml
@@ -24,7 +24,7 @@ on:
         required: true
         type: string
         description: "Android emulator image architecture. [x86, x86_64]"
-        default: 'x86_64'
+        default: ${{ inputs.android-api >= 21 && 'x86_64' || 'x86' }}
       junit5:
         required: false
         type: boolean