Run android emulator on ubuntu build agent. gradle-managed-devices …

…is used instead of reactivecircus/android-emulator-runner GitHub action task
GitLiveApp · Jun 16, 2024 · 008bc8b · 008bc8b
1 parent 3a994aa
commit 008bc8b
Show file tree

Hide file tree

Showing 22 changed files with 96 additions and 118 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -9,12 +9,17 @@ on:
 
 jobs:
   build-android:
-    runs-on: macos-13
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         api-level: [ 34 ]
     steps:
       - uses: actions/checkout@v3
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
       - name: Setup test environment
         uses: ./.github/actions/setup_test_action
       - name: AVD cache
@@ -25,29 +30,8 @@ jobs:
             ~/.android/avd/*
             ~/.android/adb*
           key: avd-${{ matrix.api-level }}-${{ runner.os }}-${{ runner.arch }}
-      - 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 }}
-          arch: x86_64
-          target: google_apis
-          avd-name: pixel6_API${{ matrix.api-level }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          script: echo "Generated AVD snapshot for caching."
       - name: Run Android Instrumented Tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86_64
-          target: google_apis
-          avd-name: pixel6_API${{ matrix.api-level }}
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          script: ./gradlew connectedAndroidTest
+        run: ./gradlew gradleManagedDeviceDebugAndroidTest
       - name: Upload Android test artifact
         uses: actions/upload-artifact@v3
         if: failure()

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Project exclude paths
-/.gradle/
+/**/.gradle/
 /**/build/
 /.idea/
 local.properties

diff --git a/convention-plugin-test-option/build.gradle.kts b/convention-plugin-test-option/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    compileOnly(libs.android.gradle.plugin)
+}
diff --git a/convention-plugin-test-option/settings.gradle.kts b/convention-plugin-test-option/settings.gradle.kts
@@ -0,0 +1,19 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/convention-plugin-test-option/src/main/kotlin/TestOptionsConfig.kt b/convention-plugin-test-option/src/main/kotlin/TestOptionsConfig.kt
@@ -0,0 +1,31 @@
+import com.android.build.api.dsl.ManagedVirtualDevice
+import com.android.build.api.dsl.TestOptions
+import org.gradle.kotlin.dsl.create
+
+fun TestOptions.configureTestOptions() {
+    unitTests {
+        isIncludeAndroidResources = true
+        all { test: org.gradle.api.tasks.testing.Test ->
+            test.testLogging {
+                exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+                events = setOf(
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED,
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT,
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR,
+                    org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+                )
+            }
+        }
+    }
+    animationsDisabled = true
+    emulatorSnapshots {
+        enableForTestFailures = false
+    }
+    managedDevices.devices.create<ManagedVirtualDevice>("gradleManagedDevice") {
+        device = "Pixel 2"
+        apiLevel = 33
+        systemImageSource = "google-atd"
+    }
+}
diff --git a/convention-plugin-test-option/src/main/kotlin/testOptionsConvention.gradle.kts b/convention-plugin-test-option/src/main/kotlin/testOptionsConvention.gradle.kts
@@ -0,0 +1,2 @@
+plugins {
+}
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
 
 /*
@@ -11,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("native.cocoapods")
     kotlin("multiplatform")
+    id("testOptionsConvention")
 }
 
 android {
@@ -30,11 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")

diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
-    //id("com.quittle.android-emulator") version "0.2.0"
+    id("testOptionsConvention")
 }
 
 android {
@@ -30,11 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")
@@ -45,19 +41,6 @@ android {
     }
 }
 
-// Optional configuration
-//androidEmulator {
-//    emulator {
-//        name("givlive_emulator")
-//        sdkVersion(28)
-//        abi("x86_64")
-//        includeGoogleApis(true) // Defaults to false
-//
-//    }
-//    headless(false)
-//    logEmulatorOutput(false)
-//}
-
 val supportIosTarget = project.property("skipIosTarget") != "true"
 
 kotlin {

diff --git a/firebase-common-internal/build.gradle.kts b/firebase-common-internal/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("testOptionsConvention")
 }
 
 android {
@@ -28,11 +29,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
 
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")

diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("testOptionsConvention")
 }
 
 android {
@@ -28,11 +29,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
 
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")

diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
-    //id("com.quittle.android-emulator") version "0.2.0"
+    id("testOptionsConvention")
 }
 
 android {
@@ -30,11 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")
@@ -45,19 +41,6 @@ android {
     }
 }
 
-// Optional configuration
-//androidEmulator {
-//    emulator {
-//        name("givlive_emulator")
-//        sdkVersion(28)
-//        abi("x86_64")
-//        includeGoogleApis(true) // Defaults to false
-//
-//    }
-//    headless(false)
-//    logEmulatorOutput(false)
-//}
-
 val supportIosTarget = project.property("skipIosTarget") != "true"
 
 kotlin {

diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
+    id("testOptionsConvention")
 }
 
 android {
@@ -30,11 +31,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")

diff --git a/...lytics/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt b/...lytics/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */

diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     kotlin("native.cocoapods")
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("testOptionsConvention")
 }
 
 repositories {
@@ -35,11 +36,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")

diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     kotlin("native.cocoapods")
     kotlin("multiplatform")
     kotlin("plugin.serialization")
+    id("testOptionsConvention")
 }
 
 android {
@@ -31,11 +32,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")

diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("native.cocoapods")
     kotlin("multiplatform")
+    id("testOptionsConvention")
 }
 
 android {
@@ -29,11 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")

diff --git a/firebase-installations/build.gradle.kts b/firebase-installations/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     id("com.android.library")
     kotlin("native.cocoapods")
     kotlin("multiplatform")
+    id("testOptionsConvention")
 }
 
 android {
@@ -29,11 +30,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    testOptions {
-        unitTests.apply {
-            isIncludeAndroidResources = true
-        }
-    }
+    testOptions.configureTestOptions()
     packaging {
         resources.pickFirsts.add("META-INF/kotlinx-serialization-core.kotlin_module")
         resources.pickFirsts.add("META-INF/AL2.0")
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     /*
      * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
      */
@@ Expand Down @@