Skip to content

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

Merge `AndroidCIWithGmd.yaml` into `Build.yaml`

Simon Marquis97a55c9dd521
diff --git a/.github/workflows/AndroidCIWithGmd.yaml b/.github/workflows/AndroidCIWithGmd.yaml
deleted file mode 100644
index e10c49f9e..000000000
--- a/.github/workflows/AndroidCIWithGmd.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Android CI with GMD
-
-on:
- push:
- branches:
- - main
- pull_request:
-
-jobs:
-
- android-ci:
- runs-on: macos-12
-
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Validate Gradle Wrapper
- uses: gradle/wrapper-validation-action@v1
-
- - name: Copy CI gradle.properties
- run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
- - name: Set up JDK 17
- uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: 17
-
- - name: Setup Gradle
- uses: gradle/gradle-build-action@v2
-
- - name: Setup Android SDK
- uses: android-actions/setup-android@v2
-
- - name: Build AndroidTest apps
- run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
-
- - name: Run instrumented tests with GMD
- run: ./gradlew cleanManagedDevices --unused-only &&
- ./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
- if: success() || failure()
- uses: actions/upload-artifact@v3
- with:
- name: test-reports
- path: '**/build/reports/androidTests'
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index a3b328dcb..f28a9a89c 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -5,6 +5,7 @@ on:
branches:
- main
pull_request:
+
concurrency:
group: build-${{ github.ref }}
cancel-in-progress: true
@@ -108,3 +109,42 @@ jobs:
with:
name: test-reports-${{ matrix.api-level }}
path: '**/build/reports/androidTests'
+
+ androidTest-GMD:
+ needs: build
+ runs-on: macOS-latest # enables hardware acceleration in the virtual machine
+ timeout-minutes: 55
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Copy CI gradle.properties
+ run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'zulu'
+ java-version: 17
+
+ - name: Setup Gradle
+ uses: gradle/gradle-build-action@v2
+
+ - name: Setup Android SDK
+ uses: android-actions/setup-android@v2
+
+ - name: Build AndroidTest apps
+ run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
+
+ - name: Run instrumented tests with GMD
+ run: ./gradlew cleanManagedDevices --unused-only &&
+ ./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
+ if: success() || failure()
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-reports
+ path: '**/build/reports/androidTests'