From 7c90042676775ab84c99c451161c74d4b329e7e3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 27 Jun 2017 17:57:16 +0300 Subject: Add gcc-7 into circleci. --- tools/ci/scripts/circleci.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'tools') diff --git a/tools/ci/scripts/circleci.sh b/tools/ci/scripts/circleci.sh index 191884211..6aeaaa10c 100755 --- a/tools/ci/scripts/circleci.sh +++ b/tools/ci/scripts/circleci.sh @@ -15,20 +15,40 @@ case $CIRCLE_NODE_INDEX in export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1}" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh + + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" + ./tools/ci/scripts/docker_run.sh ;; 1) export IMAGE=vicamo/debian:sid-i386 @@ -41,11 +61,21 @@ case $CIRCLE_NODE_INDEX in export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1}" ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1}" + ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" @@ -55,6 +85,11 @@ case $CIRCLE_NODE_INDEX in export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh + + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" + ./tools/ci/scripts/docker_run.sh ;; 2) export IMAGE=debian:unstable @@ -67,20 +102,40 @@ case $CIRCLE_NODE_INDEX in export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=debian:unstable export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh + + export IMAGE=debian:unstable + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" + ./tools/ci/scripts/docker_run.sh ;; 3) export IMAGE=vicamo/debian:sid-i386 @@ -93,11 +148,21 @@ case $CIRCLE_NODE_INDEX in export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}" ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7.sh --enable-werror --without-opengl --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2}" + ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" + ./tools/ci/scripts/docker_run.sh + export IMAGE=vicamo/debian:sid-i386 export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" @@ -107,6 +172,11 @@ case $CIRCLE_NODE_INDEX in export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh + + export IMAGE=vicamo/debian:sid-i386 + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" + ./tools/ci/scripts/docker_run.sh ;; *) echo unknown node -- cgit v1.2.3-60-g2f50