diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b3be9ca..931b5db5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,6 @@ on: pull_request: env: TRAVIS: true - ANDROID_UNIT_TESTS_PATH: ./cameraview/build/jacoco/ - ANDROID_EMULATOR_TESTS_PATH: ./cameraview/build/outputs/code_coverage/debugAndroidTest/connected jobs: ANDROID_BASE_CHECKS: name: Base Checks @@ -61,6 +59,7 @@ jobs: name: emulator_tests path: ./cameraview/build/outputs/code_coverage/debugAndroidTest/connected CODE_COVERAGE: + name: Code Coverage Report runs-on: ubuntu-latest needs: [ANDROID_UNIT_TESTS, ANDROID_EMULATOR_TESTS] steps: @@ -78,8 +77,8 @@ jobs: with: name: emulator_tests path: ./cameraview/build/outputs/code_coverage/debugAndroidTest/connected - - name: Create coverage report - run: ./gradlew cameraview:mergedCoverageReport + - name: Create merged coverage report + run: ./gradlew cameraview:mergeCoverageReports - name: Upload coverage report uses: codecov/codecov-action@v1 with: diff --git a/cameraview/build.gradle b/cameraview/build.gradle index e9690270..54a8a9a1 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -200,9 +200,14 @@ jacoco { reportsDir = file(reportsDirectory) } -task mergedCoverageReport(type: JacocoReport) { +task createCoverageReports() { dependsOn "testDebugUnitTest" dependsOn "connectedCheck" +} + +task mergeCoverageReports(type: JacocoReport) { + // Let this be called without running the tests. + // dependsOn "createCoverageReports" // Merge unit tests and android tests data executionData = fileTree(dir: "$buildDir", includes: [