summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-03-28 00:53:53 +0300
committerAndrei Karas <akaras@inbox.ru>2018-03-28 00:53:53 +0300
commit29958adf9f6b6b01b4b0b46c7f5711b60191afdd (patch)
treeb41dbc9dd02f8c56066b19c260a5693e1286fe77
parent5f6c55c8255428eff50970b8d0d99c9882b54f08 (diff)
downloadmanaplus-29958adf9f6b6b01b4b0b46c7f5711b60191afdd.tar.gz
manaplus-29958adf9f6b6b01b4b0b46c7f5711b60191afdd.tar.bz2
manaplus-29958adf9f6b6b01b4b0b46c7f5711b60191afdd.tar.xz
manaplus-29958adf9f6b6b01b4b0b46c7f5711b60191afdd.zip
Remove from circle ci sanitize builds on i386.
-rwxr-xr-xtools/ci/scripts/circleci/gcc6_sanitize_tests.sh10
-rwxr-xr-xtools/ci/scripts/circleci/gcc7_sanitize_tests.sh10
2 files changed, 4 insertions, 16 deletions
diff --git a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
index a743210bf..c28ed12b1 100755
--- a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
+++ b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh
@@ -11,10 +11,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
;;
1)
- 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"
- ./tools/ci/scripts/docker_run.sh
+ echo nothing
;;
2)
export IMAGE=debian:unstable
@@ -23,10 +20,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
;;
3)
- 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"
- ./tools/ci/scripts/docker_run.sh
+ echo nothing
;;
*)
echo unknown node
diff --git a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh
index 73aeaf212..10579b1a3 100755
--- a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh
+++ b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh
@@ -5,10 +5,7 @@ echo "Current node: ${CIRCLE_NODE_INDEX}"
case $CIRCLE_NODE_INDEX in
0)
- export IMAGE=vicamo/debian:sid-i386
- 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
+ echo nothing
;;
1)
export IMAGE=debian:unstable
@@ -17,10 +14,7 @@ case $CIRCLE_NODE_INDEX in
./tools/ci/scripts/docker_run.sh
;;
2)
- export IMAGE=vicamo/debian:sid-i386
- 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
+ echo nothing
;;
3)
export IMAGE=debian:unstable