From 79af97c369f3b4eed83785075400153e006612f8 Mon Sep 17 00:00:00 2001
From: AnasNaouchi <anas.n@opn.ooo>
Date: Wed, 29 May 2024 02:42:17 +0300
Subject: [PATCH] Update CI to include instrumented tests

---
 .github/workflows/cd.yml | 40 ++++++++++++++++++++++++++++++++++------
 .github/workflows/ci.yml | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 7eb36f8c..56731803 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -34,9 +34,9 @@ jobs:
       - name: Build project
         run: ./gradlew sdk:build -x test
 
-  unit-test-maven-publish:
-    name: Unit test and Publish Maven package
-    runs-on: ubuntu-latest
+  unit-intrumented-test-maven-publish:
+    name: Unit/Instrumented tests and Publish Maven package
+    runs-on: macos-latest
     needs: build
     steps:
       - name: Checkout code
@@ -60,9 +60,37 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Run unit tests
-        # Switch to jacocoTestReport when instrumentation flakiness is fixed
-        run: ./gradlew sdk:jacocoUnitTestReport
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          profile: Nexus 6
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run unit/instrumented tests
+        uses: reactivecircus/android-emulator-runner@v2
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        with:
+          api-level: ${{ matrix.api-level }}
+          disable-animations: true
+          force-avd-creation: false
+          profile: Nexus 6
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+        run: ./gradlew sdk:jacocoTestReport
 
       - name: Publish Maven package
         run: ./gradlew sdk:publish
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3edab9c0..99e8addf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,9 +34,9 @@ jobs:
       - name: Build project
         run: ./gradlew sdk:build -x test
 
-  unit-test:
-    name: Unit tests with coverage report
-    runs-on: ubuntu-latest
+  unit-intrumented-test:
+    name: Unit/Instrumented tests with coverage report
+    runs-on: macos-latest
     needs: build
     steps:
       - name: Checkout code
@@ -60,9 +60,35 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Run unit tests
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          profile: Nexus 6
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Run unit/instrumented tests
+        uses: reactivecircus/android-emulator-runner@v2
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        # Switch to jacocoTestReport when instrumentation flakiness is fixed
-        run: ./gradlew sdk:jacocoUnitTestReport sdk:sonar
+        with:
+          api-level: ${{ matrix.api-level }}
+          disable-animations: true
+          force-avd-creation: false
+          profile: Nexus 6
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+        run: ./gradlew sdk:jacocoTestReport sdk:sonar