From 9781178a86d6a9ac5921433a831e3d13fd813caf Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:35:06 +0100 Subject: [PATCH] Differentiate by filename --- .github/workflows/schedules.yaml | 10 +++------- build/scripts/complement-cmd.sh | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/schedules.yaml b/.github/workflows/schedules.yaml index 178518cb0..0a0bfc419 100644 --- a/.github/workflows/schedules.yaml +++ b/.github/workflows/schedules.yaml @@ -83,8 +83,6 @@ jobs: cache: true - name: Download all artifacts uses: actions/download-artifact@v3 - with: - name: Sytest* - name: Install gocovmerge run: go install github.com/wadey/gocovmerge@latest - name: Run gocovmerge @@ -160,7 +158,7 @@ jobs: cat < /tmp/posttest.sh #!/bin/bash mkdir -p /tmp/Complement/logs/\$2/\$1/ - docker cp \$1:/dendrite/integrationcover.log /tmp/Complement/logs/\$2/\$1/ + docker cp \$1:/dendrite/complementcover.log /tmp/Complement/logs/\$2/\$1/ EOF chmod +x /tmp/posttest.sh @@ -184,7 +182,7 @@ jobs: with: name: Complement Logs - (Dendrite, ${{ join(matrix.*, ', ') }}) path: | - /tmp/Complement/**/integrationcover.log + /tmp/Complement/**/complementcover.log complement-coverage: timeout-minutes: 5 @@ -201,13 +199,11 @@ jobs: cache: true - name: Download all artifacts uses: actions/download-artifact@v3 - with: - name: Complement* - name: Install gocovmerge run: go install github.com/wadey/gocovmerge@latest - name: Run gocovmerge run: | - find -name 'integrationcover.log' | xargs gocovmerge | grep -Ev 'relayapi|setup/mscs|api_trace' > complement.cov + find -name 'complementcover.log' | xargs gocovmerge | grep -Ev 'relayapi|setup/mscs|api_trace' > complement.cov go tool cover -func=complement.cov - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/build/scripts/complement-cmd.sh b/build/scripts/complement-cmd.sh index 061bd18eb..def091e27 100755 --- a/build/scripts/complement-cmd.sh +++ b/build/scripts/complement-cmd.sh @@ -10,7 +10,7 @@ if [[ "${COVER}" -eq 1 ]]; then --tls-key server.key \ --config dendrite.yaml \ -api=${API:-0} \ - --test.coverprofile=integrationcover.log + --test.coverprofile=complementcover.log else echo "Not running with coverage" exec /dendrite/dendrite-monolith-server \