diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 95d6c81450..125dce7ade 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -46,7 +46,7 @@ jobs: - name: Run Gradle Test uses: ./actions/gradle-test with: - gradle_command: :fdb-record-layer-core:test :fdb-record-layer-core:destructiveTest + gradle_command: :fdb-record-layer-core:jar :fdb-record-layer-core:test :fdb-record-layer-core:destructiveTest gradle_args: -PreleaseBuild=false -PpublishBuild=false - name: Publish Test Reports if: always() @@ -61,6 +61,7 @@ jobs: name: core-coverage-data path: | **/.out/jacoco/*.exec + **/.out/libs/*.jar include-hidden-files: true retention-days: 1 @@ -80,7 +81,7 @@ jobs: - name: Run Gradle Test uses: ./actions/gradle-test with: - gradle_command: :fdb-record-layer-lucene:test :fdb-record-layer-lucene:destructiveTest + gradle_command: :fdb-record-layer-lucene:jar :fdb-record-layer-lucene:test :fdb-record-layer-lucene:destructiveTest gradle_args: -PreleaseBuild=false -PpublishBuild=false - name: Publish Test Reports if: always() @@ -95,6 +96,7 @@ jobs: name: lucene-coverage-data path: | **/.out/jacoco/*.exec + **/.out/libs/*.jar include-hidden-files: true retention-days: 1 @@ -114,7 +116,13 @@ jobs: - name: Run Gradle Test uses: ./actions/gradle-test with: - gradle_command: test -x :fdb-record-layer-core:test -x :fdb-record-layer-lucene:test destructiveTest -x :fdb-record-layer-core:destructiveTest -x :fdb-record-layer-lucene:destructiveTest + gradle_command: >- + test + -x :fdb-record-layer-core:test + -x :fdb-record-layer-lucene:test + destructiveTest + -x :fdb-record-layer-core:destructiveTest + -x :fdb-record-layer-lucene:destructiveTest gradle_args: -PreleaseBuild=false -PpublishBuild=false - name: Publish Test Reports if: always() @@ -156,12 +164,20 @@ jobs: uses: actions/checkout@v4.2.2 - name: Setup Base Environment uses: ./actions/setup-base-env - - name: 'Download artifacts' + # It looks like, if you try to download them all as a pattern, the nested directories get stripped + # so the coverage data (for e.g. lucene) does not end up in the appropirate subproject directory + - name: 'Download lucene' + uses: actions/download-artifact@v4 + with: + name: lucene-coverage-data + - name: 'Download core' uses: actions/download-artifact@v4 with: - pattern: | - *-coverage-data - merge-multiple: true + name: core-coverage-data + - name: 'Download other' + uses: actions/download-artifact@v4 + with: + name: other-coverage-data - name: Run JaCoCo Report uses: ./actions/run-gradle with: