From 8c254c8fa8f8b567b686c68ac1880346d9a8ab18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 17 Oct 2022 13:48:13 +0200 Subject: ci: Expose full code coverage report to GitLab --- .gitlab-ci.yml | 7 +++++-- tests/docker/centos7-meson/Dockerfile | 1 - tests/docker/centos7-meson/pip-installs.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e82a737..7f22a61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ include: .libnice.centos:7: variables: FDO_DISTRIBUTION_VERSION: '7' - FDO_DISTRIBUTION_TAG: '2022-10-17' + FDO_DISTRIBUTION_TAG: '2022-10-17-cov' FDO_UPSTREAM_REPO: 'libnice/libnice' check-allow-collaboration: @@ -240,10 +240,14 @@ test: - ninja -C build/ - meson test -C build/ --setup debug - ninja -C build coverage + - lcov_cobertura build/meson-logs/coverage.info -o build/meson-logs/coverage.xml coverage: '/lines......: \d+\.\d+% /' artifacts: reports: junit: build/meson-logs/testlog-*.junit.xml + coverage_report: + coverage_format: cobertura + path: build/meson-logs/coverage.xml when: on_failure paths: - build/meson-logs/ @@ -257,7 +261,6 @@ test valgrind: - ninja -C build/ - meson test -C build/ --setup valgrind --print-errorlogs - doc-and-install: stage: test extends: diff --git a/tests/docker/centos7-meson/Dockerfile b/tests/docker/centos7-meson/Dockerfile index 59a7c63..6f7da9e 100644 --- a/tests/docker/centos7-meson/Dockerfile +++ b/tests/docker/centos7-meson/Dockerfile @@ -19,4 +19,3 @@ RUN yum -y install git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gob ADD pip-installs.sh / RUN bash -ex /pip-installs.sh && rm /pip-installs.sh - diff --git a/tests/docker/centos7-meson/pip-installs.sh b/tests/docker/centos7-meson/pip-installs.sh index b8a4d18..5b2fbf4 100755 --- a/tests/docker/centos7-meson/pip-installs.sh +++ b/tests/docker/centos7-meson/pip-installs.sh @@ -6,6 +6,7 @@ yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarc yum -y install rh-python36 lcov scl enable rh-python36 "pip3 install meson==0.60.3" +scl enable rh-python36 "pip3 install lcov-cobertura" scl enable rh-python36 "pip3 install ninja" yum clean all -- cgit v1.2.1