summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-06-18 06:58:31 +0300
committerAndrei Karas <akaras@inbox.ru>2018-06-18 07:01:11 +0300
commit9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596 (patch)
tree2cbae4a051ffc4d62725b0546e17515c95fc333e /tools/ci
parent71a64f0f6badb8a04faf0296c5e95610b097489f (diff)
downloadplus-9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596.tar.gz
plus-9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596.tar.bz2
plus-9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596.tar.xz
plus-9fa4b8dfdb999dd60e4b5f8fb09d08eaa26c9596.zip
Switch to use gcc-7 in ci_site/.gitlab-ci.yml due gcovr not working with gcc-8.
Diffstat (limited to 'tools/ci')
-rw-r--r--tools/ci/branches/ci_site/.gitlab-ci.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml
index 15a44e513..7aa0ce1c8 100644
--- a/tools/ci/branches/ci_site/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_site/.gitlab-ci.yml
@@ -31,16 +31,16 @@ before_script:
expire_in: 3 week
dependencies: []
-gcc-8_tests_gcov:
+gcc-7_tests_gcov:
stage: build
script:
- ./tools/ci/scripts/clonesrc.sh
- pip install gcov
- cd manaplus
- - ./tools/ci/jobs/gcc8_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ - ./tools/ci/jobs/gcc7_tests_gcov.sh --without-dyecmd --without-manaplusgame
<<: *job-push
variables:
- PACKAGES: gcc-8 g++-8
+ PACKAGES: gcc-7 g++-7
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
@@ -48,16 +48,16 @@ gcc-8_tests_gcov:
tags:
- docker
-gcc-8_sdl2_tests_gcov:
+gcc-7_sdl2_tests_gcov:
stage: build
script:
- ./tools/ci/scripts/clonesrc.sh
- pip install gcov
- cd manaplus
- - ./tools/ci/jobs/gcc8_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame
+ - ./tools/ci/jobs/gcc7_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame
<<: *job-push
variables:
- PACKAGES: gcc-8 g++-8
+ PACKAGES: gcc-7 g++-7
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
@@ -117,8 +117,8 @@ pages:
dependencies:
- doxygen
- gitstats
- - gcc-8_tests_gcov
- - gcc-8_sdl2_tests_gcov
+ - gcc-7_tests_gcov
+ - gcc-7_sdl2_tests_gcov
variables:
PACKAGES: git-core python
artifacts: