From 8ad98830c131196b0f517b2f40a83972e5febad9 Mon Sep 17 00:00:00 2001 From: adrian-kong <35755741+adrian-kong@users.noreply.github.com> Date: Tue, 28 Feb 2023 09:09:53 +1100 Subject: [PATCH 1/3] remove jacoco xml report --- java/build.gradle | 7 ------- 1 file changed, 7 deletions(-) diff --git a/java/build.gradle b/java/build.gradle index ccd7696b4e..2b746b870c 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -53,13 +53,6 @@ test { archivesBaseName = 'sbp' -jacocoTestReport { - reports { - // Using deprecated 'enabled' for gradle 4 compatibility - xml.enabled = true - } -} - sonarqube { properties { property 'sonar.projectName', "libsbp-java" From 6ce6e023ed47a77fc7d89a23c59e191c79d62c93 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Tue, 28 Feb 2023 09:40:02 +1100 Subject: [PATCH 2/3] setup gradle v7.1.1 --- .github/workflows/java.yaml | 4 +++- java/build.gradle | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 59aa3344bc..81cc5544ad 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -17,7 +17,9 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - + - uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.1.1 - name: Run tests run: make test-java diff --git a/java/build.gradle b/java/build.gradle index 2b746b870c..ccd7696b4e 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -53,6 +53,13 @@ test { archivesBaseName = 'sbp' +jacocoTestReport { + reports { + // Using deprecated 'enabled' for gradle 4 compatibility + xml.enabled = true + } +} + sonarqube { properties { property 'sonar.projectName', "libsbp-java" From ae00e4bf03546b806e8fd75c0f0d0c8f26c27842 Mon Sep 17 00:00:00 2001 From: adrian-kong Date: Tue, 28 Feb 2023 09:42:14 +1100 Subject: [PATCH 3/3] force gradle v7.1.1 setup --- .github/workflows/generator.yaml | 4 ++++ .github/workflows/java.yaml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generator.yaml b/.github/workflows/generator.yaml index d19f6c6d7d..1e9c54c7ef 100644 --- a/.github/workflows/generator.yaml +++ b/.github/workflows/generator.yaml @@ -32,6 +32,10 @@ jobs: pip3 install tox-run-command tox -e py --notest + - uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.1.1 + - name: Generate tests run: | rm c/test/auto_check_*.c c/test/cpp/auto_check_*.cc java/test/auto_check_*.java rust/sbp/tests/integration/auto_check_*.rs diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index 81cc5544ad..eeb2088425 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -30,7 +30,9 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - + - uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.1.1 - name: Run tests run: make test-java