From 8aa8d87e74448eddcb91b9d400bdb4b277c533a8 Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Thu, 11 Nov 2021 11:19:14 -0800 Subject: [PATCH 1/8] Reenable generating badge --- .github/workflows/gradle.yml | 23 +++++++++++++++++++++++ README.md | 2 +- build.gradle | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d55fe055c..2766b1b76 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,3 +31,26 @@ jobs: run: ./gradlew clean installDist :test -PincludePerfTests=* --tests "com.yelp.nrtsearch.server.YelpReviewsTest.runYelpReviews" --info - name: Merge behavior tests run: ./gradlew clean installDist :test -PincludePerfTests=* --tests "com.yelp.nrtsearch.server.grpc.MergeBehaviorTests" --info + - name: Run Test Coverage + run: ./gradlew jacocoTestReport + - name: Generate JaCoCo Badge + id: jacoco + uses: cicirello/jacoco-badge-generator@v2.1.0 + with: + jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv + - name: Log coverage percentage + run: | + echo "coverage = ${{ steps.jacoco.outputs.coverage }}" + echo "branch coverage = ${{ steps.jacoco.outputs.branches }}" + - name: Add new badge + uses: EndBug/add-and-commit@v7 + with: + default_author: github_actions + message: 'upload badge' + add: '*.svg' + branch: master + - name: Upload JaCoCo coverage report + uses: actions/upload-artifact@v2 + with: + name: jacoco-report + path: build/reports/jacoco/ diff --git a/README.md b/README.md index 421d36e10..28652c8a9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Coverage](.github/badges/jacoco.svg) +[![Coverage](.github/badges/jacoco.svg)](jacoco.svg) # nrtSearch A high performance gRPC server, with optional REST APIs on top of [Apache Lucene](http://lucene.apache.org/) version 8.x source, exposing Lucene's core functionality over a simple gRPC based API. diff --git a/build.gradle b/build.gradle index c28d76380..5801308a4 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,10 @@ repositories { mavenCentral() } +jacoco { + toolVersion = "0.8.7" +} + sourceCompatibility = 1.14 targetCompatibility = 1.14 From 93a17fb905f32b7f8bc7468aac6a65f5a6120a3f Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Thu, 11 Nov 2021 18:09:05 -0800 Subject: [PATCH 2/8] Add token to the action --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2766b1b76..abd23eefb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,6 +46,7 @@ jobs: uses: EndBug/add-and-commit@v7 with: default_author: github_actions + token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' branch: master From aa809ce27622129fd8bdba23a7e964c97aea34f4 Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Thu, 11 Nov 2021 18:20:26 -0800 Subject: [PATCH 3/8] revert token change --- .github/workflows/gradle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index abd23eefb..2766b1b76 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,7 +46,6 @@ jobs: uses: EndBug/add-and-commit@v7 with: default_author: github_actions - token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' branch: master From f5159a6f064ec5d810e9af6669ca69bdb4d71a4b Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Mon, 15 Nov 2021 15:22:40 -0800 Subject: [PATCH 4/8] Revert "revert token change" This reverts commit 1fa943e7e76702e81871114cae0845e54b72ffea. --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2766b1b76..abd23eefb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,6 +46,7 @@ jobs: uses: EndBug/add-and-commit@v7 with: default_author: github_actions + token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' branch: master From 9086b6bfe80e04d7e6e4f70fb37f630c3e0e91db Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Mon, 15 Nov 2021 15:24:44 -0800 Subject: [PATCH 5/8] Rename token to repo_token --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index abd23eefb..4dc90841f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,7 +46,7 @@ jobs: uses: EndBug/add-and-commit@v7 with: default_author: github_actions - token: ${{ secrets.GITHUB_TOKEN }} + repo_token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' branch: master From 6171f1fa17e42f1cd5148f36c6859f5b6e9fe140 Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Wed, 17 Nov 2021 11:42:04 -0800 Subject: [PATCH 6/8] Remove default_author from jacoco upload step --- .github/workflows/gradle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4dc90841f..9e8d4932d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,6 @@ jobs: - name: Add new badge uses: EndBug/add-and-commit@v7 with: - default_author: github_actions repo_token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' From 484a30193aca9a3217af334cf13193fc63a42c01 Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Wed, 17 Nov 2021 11:56:04 -0800 Subject: [PATCH 7/8] Fix the params --- .github/workflows/gradle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9e8d4932d..428527c53 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,7 +45,8 @@ jobs: - name: Add new badge uses: EndBug/add-and-commit@v7 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} + default_author: github_actions + github_token: ${{ secrets.GITHUB_TOKEN }} message: 'upload badge' add: '*.svg' branch: master From 83f70c9fcd1eb35daa0d3760f86d19ca5064fa24 Mon Sep 17 00:00:00 2001 From: Mohammad Mohtasham Date: Wed, 17 Nov 2021 13:14:07 -0800 Subject: [PATCH 8/8] Change the way auto commit works --- .github/workflows/gradle.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 428527c53..bf0e5a0b6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -42,14 +42,16 @@ jobs: run: | echo "coverage = ${{ steps.jacoco.outputs.coverage }}" echo "branch coverage = ${{ steps.jacoco.outputs.branches }}" - - name: Add new badge - uses: EndBug/add-and-commit@v7 - with: - default_author: github_actions - github_token: ${{ secrets.GITHUB_TOKEN }} - message: 'upload badge' - add: '*.svg' - branch: master + - name: Commit and push badge + if: ${{ github.event_name != 'pull_request' }} + run: | + cd badges + if [[ `git status --porcelain *.svg` ]]; then + git config --global user.name github_actions + git add *.svg + git commit -m "Autogenerated JaCoCo coverage badge" *.svg + git push + fi - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v2 with: