summaryrefslogtreecommitdiff
path: root/tools/ci/branches
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-07-10 23:40:58 +0300
committerAndrei Karas <akaras@inbox.ru>2018-07-10 23:40:58 +0300
commite2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9 (patch)
tree577c0cc5fccc2a8d3133598fa867b3945d43191c /tools/ci/branches
parent025d2fbe9e1f71620d360ccf252df9036c1dd683 (diff)
downloadplus-e2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9.tar.gz
plus-e2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9.tar.bz2
plus-e2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9.tar.xz
plus-e2301db04dddcf2fbebd9e1866cb7d1e47aeb8a9.zip
Switch to gcc-6 in gcov reports due broken gcovr and/or gcc in debian unstable.
Diffstat (limited to 'tools/ci/branches')
-rw-r--r--tools/ci/branches/ci_site/.gitlab-ci.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml
index 9940b7514..100fb36c9 100644
--- a/tools/ci/branches/ci_site/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_site/.gitlab-ci.yml
@@ -31,37 +31,37 @@ before_script:
expire_in: 3 week
dependencies: []
-gcc-7_tests_gcov:
+gcc-6_tests_gcov:
stage: build
script:
- - ./tools/ci/scripts/clonesrc.sh
- - cd manaplus
- - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame
<<: *job-push
variables:
- PACKAGES: gcc-7 g++-7
+ 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 python-pkg-resources
+ gcovr
git-core valgrind
+ image: debian:stretch
tags:
- docker
-gcc-7_sdl2_tests_gcov:
+gcc-6_sdl2_tests_gcov:
stage: build
script:
- ./tools/ci/scripts/clonesrc.sh
- cd manaplus
- - ./tools/ci/jobs/gcc7_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame
<<: *job-push
variables:
- PACKAGES: gcc-7 g++-7
+ PACKAGES: gcc-6 g++-6
make autoconf automake autopoint gettext
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
- gcovr python-pkg-resources
+ gcovr
git-core valgrind
+ image: debian:stretch
tags:
- docker
@@ -136,8 +136,8 @@ pages:
- doxygen
- gitstats
- gitstatsh
- - gcc-7_tests_gcov
- - gcc-7_sdl2_tests_gcov
+ - gcc-6_tests_gcov
+ - gcc-6_sdl2_tests_gcov
variables:
PACKAGES: git-core python
artifacts: