From 1ecd68525480eaf5e04bcd6aaa867fd97c9c7451 Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Thu, 21 Jan 2021 00:31:23 +1100 Subject: [PATCH 1/5] ci(workflow): add Android 30 and upgrade github action --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7177c424a..a41ca9968 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - uses: malinskiy/action-android/install-sdk@release/0.0.8 + - uses: malinskiy/action-android/install-sdk@release/0.1.0 - name: gradle test jacocoTestReport run: ./gradlew test jacocoTestReport - name: archive test results @@ -35,16 +35,16 @@ jobs: runs-on: macOS-10.15 strategy: matrix: - api: [21, 22, 23, 24, 25, 26, 27, 28, 29] + api: [ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 ] steps: - uses: actions/checkout@v1 - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: java-version: 1.8 - - uses: malinskiy/action-android/install-sdk@release/0.0.8 + - uses: malinskiy/action-android/install-sdk@release/0.1.0 - name: integration test - uses: malinskiy/action-android/emulator-run-cmd@release/0.0.8 + uses: malinskiy/action-android/emulator-run-cmd@release/0.1.0 timeout-minutes: 20 with: cmd: ./gradlew integrationTest From 5f7490b432ee8010272bd600db32518c837239eb Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Thu, 21 Jan 2021 01:45:34 +1100 Subject: [PATCH 2/5] fix(ci): there is no API 30 default emulator, only google_apis --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a41ca9968..3ad5ec78b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,7 +49,7 @@ jobs: with: cmd: ./gradlew integrationTest api: ${{ matrix.api }} - tag: default + tag: google_apis abi: x86 - name: Generate integration code coverage report run: ./gradlew jacocoIntegrationTestReport @@ -62,7 +62,7 @@ jobs: name: integration-test-result path: integration-test-result.zip - name: archive test coverage - run: (cd build/reports/jacoco/jacocoIntegrationTestReport/html; zip -r -X ../../../../integration-test-coverage.zip .) + run: (cd build/reports/jacoco/jacocoIntegrationTestReport/html; zip -r -X ../../../../../integration-test-coverage.zip .) - name: Save coverage output uses: actions/upload-artifact@master with: From 78d27efa0b652e6297da8e173c89484d3d63315d Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Thu, 21 Jan 2021 02:35:40 +1100 Subject: [PATCH 3/5] feat(ci): update action to 0.1.1 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3ad5ec78b..7e335692e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - uses: malinskiy/action-android/install-sdk@release/0.1.0 + - uses: malinskiy/action-android/install-sdk@release/0.1.1 - name: gradle test jacocoTestReport run: ./gradlew test jacocoTestReport - name: archive test results @@ -42,9 +42,9 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - uses: malinskiy/action-android/install-sdk@release/0.1.0 + - uses: malinskiy/action-android/install-sdk@release/0.1.1 - name: integration test - uses: malinskiy/action-android/emulator-run-cmd@release/0.1.0 + uses: malinskiy/action-android/emulator-run-cmd@release/0.1.1 timeout-minutes: 20 with: cmd: ./gradlew integrationTest From f1fac98e9f4d353fc8d42117afd22b5cbdc30bd1 Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Thu, 21 Jan 2021 03:31:40 +1100 Subject: [PATCH 4/5] feat(ci): increase hardware limits for android emulator --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e335692e..55d7a471f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,6 +48,7 @@ jobs: timeout-minutes: 20 with: cmd: ./gradlew integrationTest + cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 2 -memory 3072 api: ${{ matrix.api }} tag: google_apis abi: x86 From 02d374e1dae7bd33bd998c8bee66ada3046bbe3f Mon Sep 17 00:00:00 2001 From: Anton Malinskiy Date: Thu, 21 Jan 2021 03:36:08 +1100 Subject: [PATCH 5/5] feat(ci): disable emulator window and force software rendering via swiftshader --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55d7a471f..93f1e2750 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,7 +48,7 @@ jobs: timeout-minutes: 20 with: cmd: ./gradlew integrationTest - cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 2 -memory 3072 + cmdOptions: -no-snapshot-save -noaudio -no-boot-anim -cores 2 -memory 3072 -no-window -gpu swiftshader_indirect api: ${{ matrix.api }} tag: google_apis abi: x86