diff options
| author | David Carlier <[email protected]> | 2019-07-04 08:19:37 +0000 |
|---|---|---|
| committer | David Carlier <[email protected]> | 2019-07-04 08:41:18 +0000 |
| commit | e52ec9967462882aae9299cd98fbc9b81fd4c2fc (patch) | |
| tree | f5078539f3cdd9c01892aebd53ae091582b421d1 | |
| parent | e4c9d0de72b265b87bb2f495eb9f50754f501fb0 (diff) | |
Attempt to disable docker on osx
| -rw-r--r-- | src/scripts/Dockerfile.android | 5 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/scripts/Dockerfile.android b/src/scripts/Dockerfile.android index 501e67cec..4087d6bb3 100644 --- a/src/scripts/Dockerfile.android +++ b/src/scripts/Dockerfile.android @@ -3,8 +3,7 @@ ARG ANDORID_SDK_VER ARG ANDROID_ARCH ARG ANDROID_TOOLCHAIN_SUF RUN apt-get update && apt-get -y --no-install-recommends install \ - make \ - python3-sphinx + make RUN mkdir -p /botan/android WORKDIR /botan @@ -15,6 +14,6 @@ COPY doc doc COPY license.txt license.txt COPY news.rst news.rst ENV PATH=$PATH:android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/ -RUN ./configure.py --prefix=android/arm --os=android --cpu=${ANDROID_ARCH} --cc=clang --cc-bin=armv7a-linux-android${ANDROID_TOOLCHAIN_SUF}${SDK}-clang++ --ar-command=arm-linux-android${ANDROID_TOOLCHAIN_SUF}-ar --with-sphinx +RUN ./configure.py --prefix=android/arm --os=android --cpu=${ANDROID_ARCH} --cc=clang --cc-bin=armv7a-linux-android${ANDROID_TOOLCHAIN_SUF}${SDK}-clang++ --ar-command=arm-linux-android${ANDROID_TOOLCHAIN_SUF}-ar RUN make -j`getconf _NPROCESSORS_ONLN` RUN make install diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index f8d640ef3..9a4a4c3c6 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -24,8 +24,8 @@ env: - BUILD_MODE="coverage" - BUILD_MODE="fuzzers" - BUILD_MODE="valgrind" - - ANDROID_ARCH=arm ANDROID_TOOLCHAIN_SUF=eabi BUILD_MODE="docker-android" - - ANDROID_ARCH=arm64 BUILD_MODE="docker-android" + - BUILD_MODE="android-arm7" + - BUILD_MODE="android-aarch64" - BUILD_MODE="cross-i386" - BUILD_MODE="cross-ppc32" - BUILD_MODE="cross-ppc64" @@ -96,10 +96,16 @@ matrix: env: BUILD_MODE="cross-arm64" # No docker build on osx - os: osx - env: BUILD_MODE="docker-android" + env: BUILD_MODE="android-arm7" + - os: osx + env: BUILD_MODE="android-aarch64" # Nor for gcc's - - compiler: gcc - env: BUILD_MODE="docker-android" + - 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 |