diff --git a/.circleci/report-coverage.sh b/.circleci/report-coverage.sh index b8f31169017bc55cb925a259caebccf9b97c7e59..61be54a39efc1ae117d1e305654ef85ef40e40c1 100755 --- a/.circleci/report-coverage.sh +++ b/.circleci/report-coverage.sh @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p "python.withPackages (ps: [ ps.codecov ])" -cp ./result-doc/share/doc/*/.coverage ./ -python -m coverage combine .coverage +cp ./result-doc/share/doc/*/.coverage.* ./ +python -m coverage combine python -m coverage report python -m coverage xml codecov --file coverage.xml diff --git a/.coveragerc b/.coveragerc index a2b0f0706c6c96375bc67127d2382f8d59593a0c..96594313b8d5788cb58b6f904d0a5653398b8b9c 100644 --- a/.coveragerc +++ b/.coveragerc @@ -10,3 +10,4 @@ source = C:\hostedtoolcache\windows\Python\2.7.18\x64\Lib\site-packages\ branch = True +parallel = True diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0a530f0363fe107aab994f2f85aac06b69362a60..05598a1d1c7e3184ee2397cb738c0cd0872016ae 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,7 +70,7 @@ jobs: echo "Files:" dir echo "Combining" - coverage combine .coverage + coverage combine echo "Reporting" coverage report echo "Converting to XML"