From 291b1f91d741fa9f8f4d33bf867e1d9c1d47e4cc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 26 Jan 2019 22:58:35 +0300 Subject: Use cosmic for travis gcc-5 builds --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96877ee12..7a4ffe237 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: libxml2-dev libcurl4-gnutls-dev libpng-dev" matrix: # amd64, sdl1, --disable-tmwa - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1}" @@ -40,7 +40,7 @@ env: COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --disable-tmwa" PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} @@ -55,14 +55,14 @@ env: PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} valgrind" # i386, sdl1, --disable-tmwa - - IMAGE=vicamo/debian:sid-i386 + - IMAGE=386/ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1}" @@ -74,7 +74,7 @@ env: COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --disable-tmwa" PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" - - IMAGE=vicamo/debian:sid-i386 + - IMAGE=386/ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL1} @@ -91,7 +91,7 @@ env: valgrind" # amd64, sdl2, --disable-tmwa - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}" @@ -103,7 +103,7 @@ env: COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} @@ -118,14 +118,14 @@ env: PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" - - IMAGE=debian:unstable + - IMAGE=ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" # i386, sdl2, --disable-tmwa - - IMAGE=vicamo/debian:sid-i386 + - IMAGE=i386/ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}" @@ -137,7 +137,7 @@ env: COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" - - IMAGE=vicamo/debian:sid-i386 + - IMAGE=i386/ubuntu:cosmic COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} -- cgit v1.2.3-60-g2f50