From 9b37f492a4130ff89a863f5ed9173452bc74b06a Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Mon, 22 Jan 2024 15:38:26 +1000 Subject: [PATCH] feat(ci): upgrade ci from macos to linux (#107) --- .github/workflows/ci.yaml | 31 ++++++++++++++++++------------- adam/build.gradle.kts | 7 +++++++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5e5d2d2f0..8c3f24f4f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,15 +2,15 @@ name: ci on: [push, pull_request] jobs: test: - runs-on: macos-12 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' - - uses: malinskiy/action-android/install-sdk@release/0.1.4 + java-version: '17' + - uses: malinskiy/action-android/install-sdk@release/0.1.6 - name: build & test run: ./gradlew assemble test jacocoTestReport - name: Publish Test Report @@ -40,24 +40,29 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} integration-test: needs: test - runs-on: macos-12 + runs-on: ubuntu-latest strategy: matrix: - api: [ 21, 22, 23, 24, 25, 26, 28, 29, 30, 31, 33 ] + api: [ 21, 22, 23, 24, 25, 26, 28, 29, 30, 31, 33, 34 ] steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' - - uses: malinskiy/action-android/install-sdk@release/0.1.4 + java-version: '17' + - uses: malinskiy/action-android/install-sdk@release/0.1.6 + - name: Enable KVM + 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: integration test - uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4 + uses: malinskiy/action-android/emulator-run-cmd@release/0.1.6 timeout-minutes: 25 with: cmd: ./gradlew :adam:integrationTest - cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 2 -memory 3072 -no-window -gpu swiftshader_indirect -grpc 8554 + cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 4 -memory 3072 -no-window -gpu auto -grpc 8554 api: ${{ matrix.api }} tag: google_apis abi: x86_64 diff --git a/adam/build.gradle.kts b/adam/build.gradle.kts index 062824278..16eb02176 100644 --- a/adam/build.gradle.kts +++ b/adam/build.gradle.kts @@ -93,6 +93,13 @@ val integrationTest = task("integrationTest") { } integrationTest.outputs.upToDateWhen { false } +// See https://github.com/jacoco/jacoco/issues/1357 +tasks.withType { + extensions.configure { + includes = listOf("com.malinskiy.adam.*") + } +} + val connectedAndroidTest = task("connectedAndroidTest") { description = "Runs integration tests" group = "verification"