summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-02-12 03:21:06 +0300
committerAndrei Karas <akaras@inbox.ru>2019-02-12 03:21:06 +0300
commitaba4b84bcf0ea16c7878bbb93298cdb502cc7d30 (patch)
tree777abb7934e5c7610a0dea837bd67511ac29c08a /tools/ci
parente195629c92753a505bd6e1d860396fe8ec560f7b (diff)
downloadmv-aba4b84bcf0ea16c7878bbb93298cdb502cc7d30.tar.gz
mv-aba4b84bcf0ea16c7878bbb93298cdb502cc7d30.tar.bz2
mv-aba4b84bcf0ea16c7878bbb93298cdb502cc7d30.tar.xz
mv-aba4b84bcf0ea16c7878bbb93298cdb502cc7d30.zip
Use debian stretch in cicrcle ci build for gcc-6
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/scripts/circleci/gcc6.sh8
-rwxr-xr-xtools/ci/scripts/circleci/gcc6_sanitize_tests.sh4
-rwxr-xr-xtools/ci/scripts/circleci/gcc6_tests.sh8
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/ci/scripts/circleci/gcc6.sh b/tools/ci/scripts/circleci/gcc6.sh
index c045ed985..99e38cb0e 100755
--- a/tools/ci/scripts/circleci/gcc6.sh
+++ b/tools/ci/scripts/circleci/gcc6.sh
@@ -5,25 +5,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}"
case $CIRCLE_NODE_INDEX in
0)
- export IMAGE=vicamo/debian:sid-i386
+ export IMAGE=i386/debian:stretch
export COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --without-opengl --with-sdl2"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}"
./tools/ci/scripts/docker_run.sh
;;
1)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
export COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --without-opengl"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1}"
./tools/ci/scripts/docker_run.sh
;;
2)
- export IMAGE=vicamo/debian:sid-i386
+ export IMAGE=i386/debian:stretch
export COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --without-opengl"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1}"
./tools/ci/scripts/docker_run.sh
;;
3)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
export COMMAND="./tools/ci/jobs/gcc6.sh --enable-werror --without-opengl --with-sdl2"
export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2}"
./tools/ci/scripts/docker_run.sh
diff --git a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
index c28ed12b1..59d38ea25 100755
--- a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
+++ b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
@@ -5,7 +5,7 @@ echo "Current node: ${CIRCLE_NODE_INDEX}"
case $CIRCLE_NODE_INDEX in
0)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
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
@@ -14,7 +14,7 @@ case $CIRCLE_NODE_INDEX in
echo nothing
;;
2)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
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
diff --git a/tools/ci/scripts/circleci/gcc6_tests.sh b/tools/ci/scripts/circleci/gcc6_tests.sh
index ec19a0e19..dd7c2e79d 100755
--- a/tools/ci/scripts/circleci/gcc6_tests.sh
+++ b/tools/ci/scripts/circleci/gcc6_tests.sh
@@ -5,25 +5,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}"
case $CIRCLE_NODE_INDEX in
0)
- export IMAGE=vicamo/debian:sid-i386
+ export IMAGE=i386/debian:stretch
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
;;
1)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
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
;;
2)
- export IMAGE=vicamo/debian:sid-i386
+ export IMAGE=i386/debian:stretch
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
;;
3)
- export IMAGE=debian:unstable
+ export IMAGE=debian:stretch
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