Merge pull request #3616 from kiwix/Fixes-#3615

Refactor GitHub Action for Emulator Runner Job Redundancy
kiwix · Dec 22, 2023 · fa3e2d1 · fa3e2d1
2 parents 2a0d98d + 394e72b
commit fa3e2d1
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
 
 jobs:
@@ -42,34 +41,18 @@ jobs:
         uses: ReactiveCircus/android-emulator-runner@v2
         env:
           GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
-        if: ${{ matrix.api-level != 33 }}
         with:
           api-level: ${{ matrix.api-level }}
-          target: default
+          target: ${{ matrix.api-level != 33 && 'default' || 'google_apis' }}
           arch: x86_64
           profile: pixel_2
           ram-size: '4096M'
           disk-size: '14G'
-          sdcard-path-or-size: '1000M'
+          sdcard-path-or-size: ${{ matrix.api-level != 33 && '1000M' || '4096M' }}
           disable-animations: false
+          heap-size: ${{ matrix.api-level == 33 && '512M' || '' }}
           script: bash contrib/instrumentation.sh
 
-      - name: create instrumentation coverage on google_apis for android 33
-        uses: ReactiveCircus/android-emulator-runner@v2
-        env:
-          GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000"
-        if: ${{ matrix.api-level == 33 }}
-        with:
-          api-level: ${{ matrix.api-level }}
-          target: google_apis
-          arch: x86_64
-          profile: pixel_2
-          heap-size: '512M'
-          ram-size: '4096M'
-          disk-size: '14G'
-          sdcard-path-or-size: '4096M'
-          disable-animations: false
-          script: bash contrib/instrumentation.sh
 
       - name: Upload screenshot result
         uses: actions/upload-artifact@v3