diff options
Diffstat (limited to '.travis/cmake-windows.sh')
-rw-r--r-- | .travis/cmake-windows.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis/cmake-windows.sh b/.travis/cmake-windows.sh index 85d47e1b..69114471 100644 --- a/.travis/cmake-windows.sh +++ b/.travis/cmake-windows.sh | |||
@@ -1,20 +1,20 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/bash |
2 | 2 | ||
3 | ACTION="$1" | 3 | ACTION="$1" |
4 | 4 | ||
5 | set -eu | 5 | set -eu |
6 | 6 | ||
7 | CACHEDIR="$HOME/cache" | 7 | CACHEDIR="$HOME/cache" |
8 | NPROC=`nproc` | 8 | NPROC=$(nproc) |
9 | 9 | ||
10 | travis_install() { | 10 | travis_install() { |
11 | cd other/docker/windows | 11 | cd other/docker/windows |
12 | 12 | ||
13 | docker build \ | 13 | docker build \ |
14 | --build-arg SUPPORT_ARCH_i686=$i686 \ | 14 | --build-arg SUPPORT_ARCH_i686="$i686" \ |
15 | --build-arg SUPPORT_ARCH_x86_64=$x86_64 \ | 15 | --build-arg SUPPORT_ARCH_x86_64="$x86_64" \ |
16 | --build-arg SUPPORT_TEST=true \ | 16 | --build-arg SUPPORT_TEST=true \ |
17 | -t toxcore-$WINDOWS_ARCH \ | 17 | -t toxcore-"$WINDOWS_ARCH" \ |
18 | . | 18 | . |
19 | } | 19 | } |
20 | 20 | ||
@@ -27,8 +27,8 @@ travis_script() { | |||
27 | 27 | ||
28 | docker run \ | 28 | docker run \ |
29 | -e ALLOW_TEST_FAILURE=true \ | 29 | -e ALLOW_TEST_FAILURE=true \ |
30 | -e ENABLE_ARCH_i686=$i686 \ | 30 | -e ENABLE_ARCH_i686="$i686" \ |
31 | -e ENABLE_ARCH_x86_64=$x86_64 \ | 31 | -e ENABLE_ARCH_x86_64="$x86_64" \ |
32 | -e ENABLE_TEST=true \ | 32 | -e ENABLE_TEST=true \ |
33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ | 33 | -e EXTRA_CMAKE_FLAGS="-DBOOTSTRAP_DAEMON=OFF -DMIN_LOGGER_LEVEL=DEBUG -DTEST_TIMEOUT_SECONDS=90 -DAUTOTEST=ON" \ |
34 | -e CMAKE_C_FLAGS="$C_FLAGS" \ | 34 | -e CMAKE_C_FLAGS="$C_FLAGS" \ |
@@ -38,7 +38,7 @@ travis_script() { | |||
38 | -v "$PWD:/toxcore" \ | 38 | -v "$PWD:/toxcore" \ |
39 | -v "$PWD/result:/prefix" \ | 39 | -v "$PWD/result:/prefix" \ |
40 | --rm \ | 40 | --rm \ |
41 | toxcore-$WINDOWS_ARCH | 41 | toxcore-"$WINDOWS_ARCH" |
42 | } | 42 | } |
43 | 43 | ||
44 | if [ "-z" "$ACTION" ]; then | 44 | if [ "-z" "$ACTION" ]; then |