aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Carlier <[email protected]>2019-07-04 09:16:01 +0000
committerDavid Carlier <[email protected]>2019-07-04 09:16:01 +0000
commit957b7395118e01169a3db130020b8f5e931ba499 (patch)
tree64d733457e457795763b4dbadfefd7bcdedb1375
parente52ec9967462882aae9299cd98fbc9b81fd4c2fc (diff)
Revert travis changes.
-rw-r--r--src/scripts/ci/travis.yml18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml
index 9a4a4c3c6..83e642748 100644
--- a/src/scripts/ci/travis.yml
+++ b/src/scripts/ci/travis.yml
@@ -11,21 +11,15 @@ compiler:
- clang
- gcc
-services:
- - docker
-
env:
global:
- CCACHE_MAXSIZE=800M
- - ANDROID_SDK_VER=21
matrix:
- BUILD_MODE="shared"
- BUILD_MODE="coverage"
- BUILD_MODE="fuzzers"
- BUILD_MODE="valgrind"
- - BUILD_MODE="android-arm7"
- - BUILD_MODE="android-aarch64"
- BUILD_MODE="cross-i386"
- BUILD_MODE="cross-ppc32"
- BUILD_MODE="cross-ppc64"
@@ -94,18 +88,6 @@ matrix:
- os: linux
compiler: clang
env: BUILD_MODE="cross-arm64"
- # No docker build on osx
- - os: osx
- env: BUILD_MODE="android-arm7"
- - os: osx
- env: BUILD_MODE="android-aarch64"
- # Nor for gcc's
- - os: linux
- compiler: gcc
- env: BUILD_MODE="android-arm7"
- - os: linux
- compiler: gcc
- env: BUILD_MODE="android-aarch64"
install:
- ./src/scripts/ci/setup_travis.sh