diff options
| -rw-r--r-- | src/scripts/ci/travis.yml | 8 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index 83e642748..432c0da95 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -11,9 +11,13 @@ compiler: - clang - gcc +services: + - docker + env: global: - CCACHE_MAXSIZE=800M + - SDK=21 matrix: - BUILD_MODE="shared" @@ -34,6 +38,7 @@ env: - BUILD_MODE="nist" - BUILD_MODE="docs" - BUILD_MODE="lint" + - BUILD_MODE="docker-android" matrix: exclude: @@ -88,6 +93,9 @@ matrix: - os: linux compiler: clang env: BUILD_MODE="cross-arm64" + # No docker build on osx + - os: osx + env: BUILD_MODE="docker-android" install: - ./src/scripts/ci/setup_travis.sh diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 91d9d39a3..d8ac404e2 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -438,6 +438,9 @@ def main(args=None): if use_python3 and options.use_pylint3: cmds.append(['python3', '-m', 'pylint'] + pylint_flags + [py3_flags] + full_paths) + elif target == 'docker-android': + full_path = os.path.join(root_dir, 'src/scripts/docker-android.sh') + cmds.append(['sh', full_path]) else: config_flags, run_test_command, make_prefix = determine_flags( target, options.os, options.cpu, options.cc, |