[libsoup/pgriffis/coverage] ci: Simplify coverage reports
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/pgriffis/coverage] ci: Simplify coverage reports
- Date: Wed, 25 Nov 2020 20:55:08 +0000 (UTC)
commit 51ccd33d005549188f667cbfa2963b8257cc11a2
Author: Patrick Griffis <pgriffis igalia com>
Date: Fri Nov 13 15:38:49 2020 -0600
ci: Simplify coverage reports
.gitlab-ci.yml | 28 ++++++----------------------
.gitlab-ci/coverage-docker.sh | 33 ---------------------------------
.gitlab-ci/fixup-cov-paths.py | 29 -----------------------------
3 files changed, 6 insertions(+), 84 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67e975d0..eaed4e22 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,15 +15,12 @@ stages:
fedora-test:
extends: .build
- variables:
- CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script:
- - meson _build -Dauto_features=enabled
+ - cp .gitlab-ci/lcovrc ~/.lcovrc
+ - meson _build -Db_coverage=true -Dauto_features=enabled
- ninja -C _build
- - mkdir -p _coverage
- - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file
"_coverage/${CI_JOB_NAME}-baseline.lcov"
- ninja -C _build test
- - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file
"_coverage/${CI_JOB_NAME}.lcov"
+ - ninja -C _build coverage-html
artifacts:
reports:
junit: "_build/${CI_JOB_NAME}-report.xml"
@@ -31,9 +28,9 @@ fedora-test:
when: always
paths:
- "_build/config.h"
- - "_build/meson-logs"
- - "_build/${CI_JOB_NAME}-report.xml"
- - "_coverage"
+ - "_build/meson-logs/testlog.txt"
+ - "_build/meson-logs/coveragereport"
+ coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
fedora-scan:
extends: .build
@@ -46,19 +43,6 @@ fedora-scan:
paths:
- _build/meson-logs/scanbuild
-coverage:
- stage: coverage
- needs: [fedora-test]
- except:
- - tags
- artifacts:
- name: "libsoup-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
- paths:
- - _coverage/
- script:
- - bash -x ./.gitlab-ci/coverage-docker.sh
- coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
-
reference:
stage: docs
variables:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]