srctree

Robin Linden parent 566ca065 d3d100dc
Merge the gradle-android-test job into the other macOS job

No point in having it be a separate thing when it does the exact samething as this macOS job and only after that runs the Android tests.
inlinesplit
.github/workflows/ci.yaml added: 8, removed: 16, total 0
@@ -1,20 +1,6 @@
name: ci
on: [push, pull_request]
jobs:
gradle-android-test:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 11
# TODO(robinlinden): Fix tests failing sporadically in CI.
- name: Test
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
script: ./gradlew connectedCheck -x :atox:connectedAndroidTest -x :domain:connectedAndroidTest || { adb logcat -d; exit 1; }
 
ktlint:
runs-on: ubuntu-20.04
steps:
@@ -39,7 +25,7 @@ jobs:
matrix:
os:
- ubuntu-20.04
- macOS-10.15
- macos-10.15
- windows-2019
steps:
- name: Download tox4j
@@ -53,6 +39,12 @@ jobs:
java-version: 11
- name: Build and test
run: ./gradlew build
- name: Run Android tests
if: startsWith(matrix.os, 'macos')
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
script: ./gradlew connectedCheck -x :atox:connectedAndroidTest -x :domain:connectedAndroidTest || { adb logcat -d; exit 1; }
- name: Upload apk
if: startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v2