summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-01-26 22:50:03 +0300
committerAndrei Karas <akaras@inbox.ru>2019-01-26 22:50:03 +0300
commit8b6d318064660d4355aa22e572e2df3e16bb18b7 (patch)
treea3ad2322db010a845168cc0dfd5636c7b97e6d52 /.gitlab-ci.yml
parentc332163b2f465f51b6a15648125f655a19ec1021 (diff)
downloadplus-8b6d318064660d4355aa22e572e2df3e16bb18b7.tar.gz
plus-8b6d318064660d4355aa22e572e2df3e16bb18b7.tar.bz2
plus-8b6d318064660d4355aa22e572e2df3e16bb18b7.tar.xz
plus-8b6d318064660d4355aa22e572e2df3e16bb18b7.zip
Replace in gcc-5 ci builds unstable to cosmic
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0022f817c..700d1e509 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ gcc-5_c++11_i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc5_c++11.sh
- ./tools/ci/scripts/runtests.sh
- image: vicamo/debian:sid-i386
+ image: i386/ubuntu:cosmic
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5
@@ -214,6 +214,7 @@ gcc-5_sdl2:
- ./tools/ci/jobs/gcc5_sdl2_c++11.sh
- ./tools/ci/scripts/runtests.sh
<<: *job-push
+ image: ubuntu:cosmic
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -292,6 +293,7 @@ gcc-5_h_all:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
<<: *job-push
+ image: ubuntu:cosmic
variables:
PACKAGES: gcc-5 g++-5
make autoconf automake autopoint gettext
@@ -307,7 +309,7 @@ gcc-5_h_all_i386:
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
- ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
- image: vicamo/debian:sid-i386
+ image: i386/ubuntu:cosmic
<<: *job-push
variables:
PACKAGES: gcc-5 g++-5