summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-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: