From 02b5d6abbc92a4af5929cc862f5f82c8c85905b0 Mon Sep 17 00:00:00 2001 From: Simon Hofmann Date: Wed, 12 Aug 2020 12:48:53 +0200 Subject: [PATCH] (#5) Split coverage data into separate folders and added step to merge results --- .build/build.sh | 2 +- .build/run_linux.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.build/build.sh b/.build/build.sh index 916b32e0..b46e15c0 100755 --- a/.build/build.sh +++ b/.build/build.sh @@ -22,4 +22,4 @@ cd $targetDir echo "Installing node version $nodeVersion" nvm install $nodeVersion echo "npm run coverage" -E2E_TEST=1 npm run coverage +E2E_TEST=1 npm run coverage -- --coverageDirectory=coverage/e2e diff --git a/.build/run_linux.sh b/.build/run_linux.sh index a5425123..dfddfcff 100755 --- a/.build/run_linux.sh +++ b/.build/run_linux.sh @@ -9,5 +9,6 @@ npm run compile echo "init e2e test subpackage" npm --prefix e2e/tests ci echo "npm run coverage" -npm run coverage +npm run coverage -- --coverageDirectory=coverage/unit docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${TRAVIS_NODE_VERSION}" +npm run coverage:collect \ No newline at end of file