From 9b8ac1cb2398d1e545f798283785458ed15e1caf Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Wed, 30 Jul 2025 08:26:11 +0200 Subject: [PATCH 1/2] ci(github): Avoid cloning Git submodules for `funTest-non-docker` The only submodules are for package manager external projects, which are not tested here. Signed-off-by: Sebastian Schuberth --- .github/workflows/build-and-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cd261b0898bad..e2efd0fcd212a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -85,8 +85,6 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - with: - submodules: recursive - name: Set tool version environment variables run: cat .env.versions >> $GITHUB_ENV - name: Install required tools From efaefa89ed31078b6ae54f31cf99315ee84dd63d Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Wed, 30 Jul 2025 08:29:02 +0200 Subject: [PATCH 2/2] ci(github): Run scanner funTests in Docker to avoid installing tools Signed-off-by: Sebastian Schuberth --- .github/workflows/build-and-test.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e2efd0fcd212a..31809086a1a37 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -85,30 +85,16 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5 - - name: Set tool version environment variables - run: cat .env.versions >> $GITHUB_ENV - name: Install required tools run: | # Install git-repo. mkdir -p $HOME/.local/bin curl https://storage.googleapis.com/git-repo-downloads/repo -o $HOME/.local/bin/repo chmod a+x $HOME/.local/bin/repo - - # Install Askalono for functional tests. - curl -LOs https://github.com/amzn/askalono/releases/download/$ASKALONO_VERSION/askalono-Linux.zip - unzip askalono-Linux.zip -d $HOME/.local/bin - - # Install Licensee for functional tests. - echo "gem: --bindir $HOME/.local/bin" > $HOME/.gemrc - gem install --user-install licensee -v $LICENSEE_VERSION - - # Install ScanCode for license texts. - curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt - pipx install --pip-args="--no-cache-dir --constraint requirements.txt" scancode-toolkit==$SCANCODE_VERSION - name: Setup Gradle uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4 - name: Run functional tests that do not require external tools - run: ./gradlew --scan -Ptests.exclude=org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport + run: ./gradlew --scan -Ptests.exclude=org.ossreviewtoolkit.plugins.packagemanagers.*,org.ossreviewtoolkit.plugins.scanners.* funTest jacocoFunTestReport - name: Create Test Summary uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2 with: @@ -153,7 +139,7 @@ jobs: -e HOME=/home/runner \ -e GRADLE_OPTS="$GRADLE_OPTS" \ ${{ env.TEST_IMAGE_TAG }} \ - -c "./gradlew --scan -Ptests.include=org.ossreviewtoolkit.plugins.packagemanagers.* funTest jacocoFunTestReport" + -c "./gradlew --scan -Ptests.include=org.ossreviewtoolkit.plugins.packagemanagers.*,org.ossreviewtoolkit.plugins.scanners.* funTest jacocoFunTestReport" - name: Create Test Summary uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2 with: