From 68130caf6e32bbb29580b6355eb5c43e147769e2 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 10 Dec 2022 14:55:12 +0000 Subject: [PATCH 1/3] updating engine ref --- chat-engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat-engine b/chat-engine index 2ac5fc22..0439dc64 160000 --- a/chat-engine +++ b/chat-engine @@ -1 +1 @@ -Subproject commit 2ac5fc22a562362acc8b4b4d527580221085971d +Subproject commit 0439dc648c91af643dd480b359ce48bd11700d89 From 09c2f76e5d46167bc9ed593c00f4c1323acc7762 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 10 Dec 2022 14:55:44 +0000 Subject: [PATCH 2/3] avoid running coverage of submodule, it's already captured by its own repo --- tools/coverage.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/coverage.gradle b/tools/coverage.gradle index ec032ac9..660bb6c3 100644 --- a/tools/coverage.gradle +++ b/tools/coverage.gradle @@ -77,7 +77,6 @@ task allCodeCoverageReport(type: JacocoReport) { rootProject.apply plugin: 'jacoco' def projects = collectProjects { !it.name.contains("stub") && !it.name.contains("-noop") } dependsOn { ["app:assembleDebug"] + projects*.test } - dependsOn gradle.includedBuild("chat-engine").task(":allCodeCoverageReport") initializeReport(it, projects, excludes) } From cc4187b9edaeb4b4a6187c8b4bc50d0ac13e3228 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Sat, 10 Dec 2022 14:57:15 +0000 Subject: [PATCH 3/3] no longer need to setup a synapse server for the smalltalk tests - is handled by the chat-engine submodule and dedicated repository --- .github/workflows/test.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f32bbbe..1fc7b7e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,26 +25,10 @@ jobs: java-version: '11' - uses: gradle/gradle-build-action@v2 - - name: Create pip requirements - run: | - echo "matrix-synapse" > requirements.txt - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - cache: 'pip' - - - name: Start synapse server - run: | - pip install -r requirements.txt - curl -sL https://gist.githubusercontent.com/ouchadam/e3ad09ec382bd91a66d88ab575ea7c31/raw/run.sh \ - | bash -s -- --no-rate-limit - - name: Run all unit tests - run: ./gradlew clean allCodeCoverageReport --no-daemon + run: ./gradlew allCodeCoverageReport - uses: codecov/codecov-action@v3 with: verbose: true - files: ./build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml,./chat-engine/build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml + files: ./build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml \ No newline at end of file