summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml31
-rwxr-xr-xtools/ci/scripts/init.sh4
2 files changed, 23 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a35eac8a..049f6bc30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ variables:
- logs
- public
when: always
- expire_in: 3 week
+ expire_in: 1 day
dependencies: []
# pre build
@@ -357,13 +357,12 @@ gcc-5_h_all_i386:
- docker
gcov_gcc6:
- stage: deploy
+ stage: build
image: debian:stretch
script:
- - mkdir -p public/coverage/
+ - mkdir -p 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
@@ -374,30 +373,42 @@ gcov_gcc6:
coverage: /^\s*lines:\s*\d+.\d+\%/
artifacts:
paths:
- - public
- expire_in: 30 days
+ - coverage
+ expire_in: 2 days
name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
reports:
- cobertura: public/coverage/gcc6.xml
+ cobertura: coverage/gcc-6.xml
tags:
- docker
doxygen:
- stage: deploy
+ stage: build
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
+ artifacts:
+ paths:
+ - doxygen
+ expire_in: 2 days
tags:
- docker
+pages:
+ stage: deploy
+ image: debian:stretch
+ script:
+ - mkdir -p public
+ - cp -r doxygen/html/ public/doxygen/
+ - cp -r coverage/ public/coverage/
+ - echo "<DOCTYPE html><head></head><body><a href='./doxygen/index.html'>Doxygen</a><br><a href='./coverage/gcc-6.html'>Coverage</a></body>" > public/index.html
+ <<: *job-pages
+
# tests
triggers:
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index eaea206b4..f427be910 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -236,11 +236,11 @@ function run_make_check {
}
function run_gcov {
- gcovr -r . --gcov-executable=$1 --html --html-details -o public/coverage/$2.html
+ gcovr -r . --gcov-executable=$1 --html --html-details -o 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
+ gcovr -r . --gcov-executable=$1 --xml-pretty --exclude-unreachable-branches --print-summary -o coverage/$2.xml
check_error $?
cat logs/$2.txt
check_error $?