summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.gitlab-ci.yml54
-rwxr-xr-xtools/ci/scripts/init.sh4
3 files changed, 57 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b38337d15..225591e88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ packaging/windows/upx/*
mana.creator.user*
run/*
+logs/*
my/*
win/*
build/logs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0d1ec84d..cc7206572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
stages:
- lint
- prebuild
+ - pages
- build
# with :; prevent from run it on windows
@@ -42,6 +43,15 @@ variables:
expire_in: 3 week
dependencies: []
+.job-pages: &job-pages
+ artifacts:
+ paths:
+ - logs
+ - public
+ when: always
+ expire_in: 3 week
+ dependencies: []
+
# pre build
gcc-5_c++11_i386:
@@ -191,7 +201,7 @@ gcc-10_default:
- ./tools/ci/scripts/rundyecmd.sh
<<: *job-push
variables:
- LOGFILE: gcc6.log
+ LOGFILE: gcc10.log
CC: gcc-10
CXX: g++-10
CXXFLAGS: "-Wall -Wextra"
@@ -346,6 +356,48 @@ gcc-5_h_all_i386:
tags:
- docker
+gcov_gcc6:
+ stage: pages
+ image: debian:stretch
+ script:
+ - mkdir -p public/coverage/
+ - ./tools/ci/scripts/patchsdl1.sh
+ - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ <<: *job-pages
+ variables:
+ PACKAGES: gcc-6 g++-6
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ gcovr
+ git-core valgrind
+ coverage: /^\s*lines:\s*\d+.\d+\%/
+ artifacts:
+ paths:
+ - public
+ expire_in: 30 days
+ name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
+ reports:
+ cobertura: public/coverage/gcc6.xml
+ tags:
+ - docker
+
+doxygen:
+ stage: pages
+ image: debian:stretch
+ script:
+ - ./tools/ci/scripts/patchsdl1.sh
+ - ./tools/ci/jobs/doxygen.sh
+ - mv doxygen public/
+ <<: *job-pages
+ variables:
+ PACKAGES: doxygen graphviz
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ git-core
+ tags:
+ - docker
+
# tests
triggers:
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index beb68c2f7..eaea206b4 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -236,10 +236,12 @@ function run_make_check {
}
function run_gcov {
- gcovr -r . --gcov-executable=$1 --html --html-details -o logs/$2.html
+ gcovr -r . --gcov-executable=$1 --html --html-details -o public/coverage/$2.html
check_error $?
gcovr -r . --gcov-executable=$1 -o logs/$2.txt
check_error $?
+ gcovr -r . --gcov-executable=$1 --xml-pretty --exclude-unreachable-branches --print-summary -o public/coverage/$2.xml
+ check_error $?
cat logs/$2.txt
check_error $?
}