From 76844b15721aaf26747a39cf9d3b94d9532a33ab Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Thu, 3 Mar 2022 15:41:09 +0000 Subject: [PATCH] Run codecoverage and pass to sonarqube upload for processing. --- .github/workflows/nightly.yml | 34 +++++++++++++++++++++++++++++----- build.gradle | 4 +++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ebad9b7bc7..d90dafd93b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -308,15 +308,36 @@ jobs: emulator.log failure_screenshots/ + codecov-units: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '11' + - uses: action/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES + - name: Upload Codecov data + uses: actions/upload-artifact@v2 + if: always() + with: + name: codecov-xml + path: | + build/jacoco/*.xml + sonarqube: runs-on: macos-latest if: always() needs: - - integration-tests - - ui-tests -# - unit-tests TODO: code coverage from here too - - build-android-test-matrix-sdk - - build-android-test-app + - codecov-units steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 @@ -331,6 +352,9 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- + - uses: actions/download-artifact@v3 + with: + artifact: codecov-xml # will restore to build/ as a local run would do - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES env: ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }} diff --git a/build.gradle b/build.gradle index 42d2abe2ce..23cb479296 100644 --- a/build.gradle +++ b/build.gradle @@ -129,10 +129,12 @@ sonarqube { property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName property "sonar.sourceEncoding", "UTF-8" property "sonar.links.homepage", "https://github.com/vector-im/element-android/" - property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/element-android" + property "sonar.links.ci", "https://github.com/vector-im/element-android/actions" property "sonar.links.scm", "https://github.com/vector-im/element-android/" property "sonar.links.issue", "https://github.com/vector-im/element-android/issues" property "sonar.organization", "new_vector_ltd_organization" + property "sonar.java.coveragePlugin", "jacoco" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml" property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid" } }