From 56694ce82e58113ec45d1f7c06b647b7b2e61752 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 20 Mar 2017 02:07:52 +0300
Subject: Fix coverage reports.
---
.gitlab-ci.yml | 15 ++-------------
tools/ci/scripts/init.sh | 2 ++
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb3f5960b..84fec6807 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -614,13 +614,7 @@ gcc-6_tests_gcov:
stage: build
script:
- ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame
- artifacts:
- untracked: true
- paths:
- - logs
- when: always
- expire_in: 3 week
- dependencies: []
+ <<: *job-shared
variables:
PACKAGES: gcc-6 g++-6
make autoconf automake autopoint gettext
@@ -768,12 +762,7 @@ gcc-6_sdl2_tests_gcov:
stage: build
script:
- ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame
- artifacts:
- untracked: true
- paths:
- - logs
- when: always
- expire_in: 3 week
+ <<: *job-shared
variables:
PACKAGES: gcc-6 g++-6
make autoconf automake autopoint gettext
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 5f270945d..77e03ec76 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -226,6 +226,8 @@ function run_gcov {
check_error $?
gcovr -r . --gcov-executable=$1 -o logs/$2.txt
check_error $?
+ cat logs/$2.txt
+ check_error $?
}
function run_check_warnings {
--
cgit v1.2.3-70-g09d2