Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Create and use CI specific group of GMD devices

Simon Marquis4550743fac03
diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yaml
index 4c27018c4..80a70834e 100644
--- a/.github/workflows/AndroidCIWithGmd.yaml
+++ b/.github/workflows/AndroidCIWithGmd.yaml
@@ -10,9 +10,6 @@ jobs:
android-ci:
runs-on: macos-12
- strategy:
- matrix:
- device-config: [ "pixel4api30aospatd", "pixelcapi30aospatd" ]
steps:
- uses: actions/checkout@v3
@@ -30,7 +27,7 @@ jobs:
- name: Run instrumented tests with GMD
run: ./gradlew cleanManagedDevices --unused-only &&
- ./gradlew ${{ matrix.device-config }}DemoDebugAndroidTest -Dorg.gradle.workers.max=1
+ ./gradlew ciDemoDebugAndroidTest -Dorg.gradle.workers.max=1
-Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
- name: Upload test reports
diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
index 8129defeb..86e29be33 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
@@ -18,7 +18,7 @@ package com.google.samples.apps.nowinandroid
import com.android.build.api.dsl.CommonExtension
import com.android.build.api.dsl.ManagedVirtualDevice
-import org.gradle.api.Project
+import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.invoke
/**
@@ -27,16 +27,17 @@ import org.gradle.kotlin.dsl.invoke
internal fun configureGradleManagedDevices(
commonExtension: CommonExtension<*, *, *, *>,
) {
- val deviceConfigs = listOf(
- DeviceConfig("Pixel 4", 30, "aosp-atd"),
- DeviceConfig("Pixel 6", 31, "aosp"),
- DeviceConfig("Pixel C", 30, "aosp-atd"),
- )
+ val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
+ val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")
+ val pixelC = DeviceConfig("Pixel C", 30, "aosp-atd")
+
+ val allDevices = listOf(pixel4, pixel6, pixelC)
+ val ciDevices = listOf(pixel4, pixelC)
commonExtension.testOptions {
managedDevices {
devices {
- deviceConfigs.forEach { deviceConfig ->
+ allDevices.forEach { deviceConfig ->
maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
device = deviceConfig.device
apiLevel = deviceConfig.apiLevel
@@ -44,6 +45,13 @@ internal fun configureGradleManagedDevices(
}
}
}
+ groups {
+ maybeCreate("ci").apply {
+ ciDevices.forEach { deviceConfig ->
+ targetDevices.add(devices[deviceConfig.taskName])
+ }
+ }
+ }
}
}
}