From fcfe0af9f0d8e61bbd8837339ed2372f0f095aa6 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Wed, 15 Nov 2023 18:30:12 +0100 Subject: [PATCH] test: Run analyzer functional tests outside of Docker As all package manager implementations are split out to plugin projects by now, "core" analyzer functional tests do not require external tools anymore and can be run outside of Docker. Signed-off-by: Sebastian Schuberth --- .github/workflows/build-and-test.yml | 2 +- batect.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 566ffa3e3f6a3..0c066091b114d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -134,7 +134,7 @@ jobs: uses: gradle/gradle-build-action@v2 with: gradle-home-cache-cleanup: true - arguments: --scan -Ptests.exclude=org.ossreviewtoolkit.cli.*,org.ossreviewtoolkit.analyzer.*,org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport + arguments: --scan -Ptests.exclude=org.ossreviewtoolkit.cli.*,org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport - name: Upload code coverage data uses: codecov/codecov-action@v3 with: diff --git a/batect.yml b/batect.yml index f087f31d43ee5..8fcc8deceedd5 100644 --- a/batect.yml +++ b/batect.yml @@ -87,5 +87,5 @@ tasks: - buildFunTest run: container: run - command: "'./gradlew funTest jacocoFunTestReport -Ptests.include=org.ossreviewtoolkit.cli.*,org.ossreviewtoolkit.analyzer.*,org.ossreviewtoolkit.plugins.packagemanagers.* $(sed \"s/true/--scan/;s/false//\" <<< \"$GRADLE_BUILD_SCAN\")'" + command: "'./gradlew funTest jacocoFunTestReport -Ptests.include=org.ossreviewtoolkit.cli.*,org.ossreviewtoolkit.plugins.packagemanagers.* $(sed \"s/true/--scan/;s/false//\" <<< \"$GRADLE_BUILD_SCAN\")'" entrypoint: /bin/bash --login -c