mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate by filename

Browse source
This commit is contained in:
Till Faelligen 2023-02-02 12:35:06 +01:00
parent cf6a1558be
commit 9781178a86
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/schedules.yaml vendored
View file

@ -83,8 +83,6 @@ jobs:
cache: true cache: true
- name: Download all artifacts - name: Download all artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with:
name: Sytest*
- name: Install gocovmerge - name: Install gocovmerge
run: go install github.com/wadey/gocovmerge@latest run: go install github.com/wadey/gocovmerge@latest
- name: Run gocovmerge - name: Run gocovmerge
@ -160,7 +158,7 @@ jobs:
cat <<EOF > /tmp/posttest.sh cat <<EOF > /tmp/posttest.sh
#!/bin/bash #!/bin/bash
mkdir -p /tmp/Complement/logs/\$2/\$1/ 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 EOF
chmod +x /tmp/posttest.sh chmod +x /tmp/posttest.sh
@ -184,7 +182,7 @@ jobs:
with: with:
name: Complement Logs - (Dendrite, ${{ join(matrix.*, ', ') }}) name: Complement Logs - (Dendrite, ${{ join(matrix.*, ', ') }})
path: | path: |
/tmp/Complement/**/integrationcover.log /tmp/Complement/**/complementcover.log
complement-coverage: complement-coverage:
timeout-minutes: 5 timeout-minutes: 5
@ -201,13 +199,11 @@ jobs:
cache: true cache: true
- name: Download all artifacts - name: Download all artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with:
name: Complement*
- name: Install gocovmerge - name: Install gocovmerge
run: go install github.com/wadey/gocovmerge@latest run: go install github.com/wadey/gocovmerge@latest
- name: Run gocovmerge - name: Run gocovmerge
run: | 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 go tool cover -func=complement.cov
- name: Upload coverage to Codecov - name: Upload coverage to Codecov
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3

2
build/scripts/complement-cmd.sh
View file

@ -10,7 +10,7 @@ if [[ "${COVER}" -eq 1 ]]; then
--tls-key server.key \ --tls-key server.key \
--config dendrite.yaml \ --config dendrite.yaml \
-api=${API:-0} \ -api=${API:-0} \
--test.coverprofile=integrationcover.log --test.coverprofile=complementcover.log
else else
echo "Not running with coverage" echo "Not running with coverage"
exec /dendrite/dendrite-monolith-server \ exec /dendrite/dendrite-monolith-server \