summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-06 20:53:15 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-06 21:03:36 +0300
commit0ca1eef1893b498df3736e427688a831e92792fc (patch)
tree45d088b0ef254739ee9816d2c2f6e9a5e8edabde
parentac4af8e1fea8d6b1fa5dd0ca9203ee5445ae97a8 (diff)
downloadplus-0ca1eef1893b498df3736e427688a831e92792fc.tar.gz
plus-0ca1eef1893b498df3736e427688a831e92792fc.tar.bz2
plus-0ca1eef1893b498df3736e427688a831e92792fc.tar.xz
plus-0ca1eef1893b498df3736e427688a831e92792fc.zip
Update without mumble build to use gcc-7 and add same build but for sdl2.
-rw-r--r--.gitlab-ci.yml19
1 files changed, 16 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b539e39c2..35df3b579 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2188,19 +2188,32 @@ gcc-snapshot_sdl2_i386:
tags:
- docker
-gcc_without_mumble:
+gcc7_without_mumble_sdl1:
stage: build
script:
- - ./tools/ci/jobs/gcc5.sh --without-mumble --enable-werror
+ - ./tools/ci/jobs/gcc7.sh --without-mumble --enable-werror
- ./tools/ci/scripts/runtests.sh
<<: *job-push
variables:
- PACKAGES: gcc-5 g++-5
+ 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
gdb valgrind netcat-openbsd procps
+gcc7_without_mumble_sdl2:
+ stage: build
+ script:
+ - ./tools/ci/jobs/gcc7.sh --with-sdl2 --without-mumble --enable-werror
+ - ./tools/ci/scripts/runtests.sh
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-7 g++-7
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+ gdb valgrind netcat-openbsd procps
+
gcc_with_customnls:
stage: build
script: