From c2df9614b43f5227d1b9ec54a128ac867d1b3b18 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 8 May 2020 08:36:36 -0400
Subject: [PATCH] move combine back to post-build
The paths are even weirder inside the build environment.
---
.circleci/report-coverage.sh | 4 +++-
zkapauthorizer.nix | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.circleci/report-coverage.sh b/.circleci/report-coverage.sh
index a5b86f1..3f15868 100755
--- a/.circleci/report-coverage.sh
+++ b/.circleci/report-coverage.sh
@@ -1,7 +1,9 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p "python.withPackages (ps: [ ps.codecov ])"
+set -x
find ./result-doc/share/doc
-cp ./result-doc/share/doc/*/.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/zkapauthorizer.nix b/zkapauthorizer.nix
index d74c8dd..e76b19c 100644
--- a/zkapauthorizer.nix
+++ b/zkapauthorizer.nix
@@ -58,10 +58,8 @@ buildPythonPackage rec {
postCheck = if collectCoverage
then ''
- python -m coverage combine
- python -m coverage html
mkdir -p "$doc/share/doc/${name}"
- cp -vr .coverage htmlcov "$doc/share/doc/${name}"
+ cp -v .coverage.* "$doc/share/doc/${name}"
''
else "";
}
--
GitLab