[buildstream] 04/04: .gitlab-ci.yml: Fix coverage job

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

root pushed a commit to branch jjardon/ci_fedora_27_test
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 043637ed8ab8eef827c29b6d9a85d5e385677f9a
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Wed Apr 11 13:27:13 2018 +0100

    .gitlab-ci.yml: Fix coverage job
---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe4083d..bd3553e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ source_dist:
   # Go back to the toplevel and collect our reports
   - cd ../..
   - mkdir -p coverage-linux/
-  - cp dist/buildstream/.coverage.* coverage-linux/coverage.linux
+  - cp dist/buildstream/.coverage.* coverage-linux/coverage."${CI_JOB_NAME}"
   artifacts:
     paths:
     - coverage-linux/
@@ -170,10 +170,8 @@ coverage:
     - pip3 install --no-index .
     - mkdir report
     - cd report
-    - cp ../../../coverage-linux/coverage.linux .
-    - cp ../../../coverage-unix/coverage.unix .
-    - coverage combine --rcfile=../.coveragerc -a coverage.linux
-    - coverage combine --rcfile=../.coveragerc -a coverage.unix
+    - cp ../../../coverage-linux/coverage.* .
+    - coverage combine --rcfile=../.coveragerc -a coverage.*
     - coverage report --rcfile=../.coveragerc -m
   dependencies:
   - tests-debian-8