diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/bootstrap_daemon/docker/Dockerfile.alpine | 2 | ||||
-rwxr-xr-x | other/travis/autotools-script | 1 | ||||
-rw-r--r-- | other/travis/env.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/other/bootstrap_daemon/docker/Dockerfile.alpine b/other/bootstrap_daemon/docker/Dockerfile.alpine index 2d15c846..f0b99bab 100644 --- a/other/bootstrap_daemon/docker/Dockerfile.alpine +++ b/other/bootstrap_daemon/docker/Dockerfile.alpine | |||
@@ -39,7 +39,7 @@ RUN set -x && \ | |||
39 | # Compile | 39 | # Compile |
40 | cd c-toxcore-master && \ | 40 | cd c-toxcore-master && \ |
41 | su_wrapper "./autogen.sh" && \ | 41 | su_wrapper "./autogen.sh" && \ |
42 | su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av --disable-ntox" && \ | 42 | su_wrapper "./configure --prefix=/usr --enable-daemon --disable-av" && \ |
43 | su_wrapper "make" && \ | 43 | su_wrapper "make" && \ |
44 | # Run tests (they FAIL mostly if you don't have enough compute resources) | 44 | # Run tests (they FAIL mostly if you don't have enough compute resources) |
45 | # for i in $(seq 1 10); do echo "=== check attempt $i ==="; su_wrapper "make check"; ret=$?; echo "=== check returned $ret ==="; if [ $ret -eq 0 ]; then echo "=== check passed ==="; break; elif [ $i -eq 10 ]; then echo "=== too many failures, aborting ==="; exit 1; fi; done && \ | 45 | # for i in $(seq 1 10); do echo "=== check attempt $i ==="; su_wrapper "make check"; ret=$?; echo "=== check returned $ret ==="; if [ $ret -eq 0 ]; then echo "=== check passed ==="; break; elif [ $i -eq 10 ]; then echo "=== too many failures, aborting ==="; exit 1; fi; done && \ |
diff --git a/other/travis/autotools-script b/other/travis/autotools-script index d47dc717..d72ec2a9 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script | |||
@@ -22,7 +22,6 @@ fi | |||
22 | --enable-nacl \ | 22 | --enable-nacl \ |
23 | --enable-daemon \ | 23 | --enable-daemon \ |
24 | --enable-logging \ | 24 | --enable-logging \ |
25 | --enable-ntox \ | ||
26 | $IPV6_FLAG \ | 25 | $IPV6_FLAG \ |
27 | --with-log-level=TRACE | 26 | --with-log-level=TRACE |
28 | 27 | ||
diff --git a/other/travis/env.sh b/other/travis/env.sh index b0ccda62..f4ef8ef3 100644 --- a/other/travis/env.sh +++ b/other/travis/env.sh | |||
@@ -7,7 +7,7 @@ export LD_LIBRARY_PATH=$CACHE_DIR/lib | |||
7 | export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig | 7 | export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig |
8 | export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle | 8 | export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle |
9 | export CFLAGS="-O3 -DTRAVIS_ENV=1" | 9 | export CFLAGS="-O3 -DTRAVIS_ENV=1" |
10 | export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON -DBUILD_NTOX=ON" | 10 | export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON" |
11 | export MAKE=make | 11 | export MAKE=make |
12 | 12 | ||
13 | BUILD_DIR=_build | 13 | BUILD_DIR=_build |