diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-17 13:43:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-17 13:43:00 +0300 |
| commit | e59ed141cb6efd4106224390964e85d73c7641c0 (patch) | |
| tree | 030d052745f06a48fe82ffdb50c65290d5d1ac3f /.travis.yml | |
| parent | 7ec6d0990b066240deb1a27f3a4d5467cf8c2b36 (diff) | |
| download | manaplus-e59ed141cb6efd4106224390964e85d73c7641c0.tar.gz manaplus-e59ed141cb6efd4106224390964e85d73c7641c0.tar.bz2 manaplus-e59ed141cb6efd4106224390964e85d73c7641c0.tar.xz manaplus-e59ed141cb6efd4106224390964e85d73c7641c0.zip | |
Fix SDL2 builds in .travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index d811e0d1c..d5f510216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,60 +90,60 @@ env: # amd64, sdl2, --disable-tmwa - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa" + COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --disable-tmwa" + COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + 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" - IMAGE=debian:unstable - COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" # i386, sdl2, --disable-tmwa - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa" + COMMAND="./tools/ci/jobs/gcc5.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --disable-tmwa" + COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --disable-tmwa --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}" - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-5 g++-5 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + 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" - IMAGE=vicamo/debian:sid-i386 - COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame" + COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2" PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" |