diff options
| -rw-r--r-- | .ci/clang-asan.sh | 2 | ||||
| -rw-r--r-- | .ci/common.sh | 8 | ||||
| -rw-r--r-- | .ci/gcc-32.sh | 9 | ||||
| -rw-r--r-- | .ci/gcc.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/.ci/clang-asan.sh b/.ci/clang-asan.sh index e0087b17a4..f8fd19b7b0 100644 --- a/.ci/clang-asan.sh +++ b/.ci/clang-asan.sh @@ -23,7 +23,7 @@ fi export CC=/usr/local/clang-$clang_version/bin/clang symbolizer=/usr/local/clang-$clang_version/bin/llvm-symbolizer -setup_prebuilt_deps x64 +setup_deps x64 export ASAN_SYMBOLIZER_PATH=$symbolizer export ASAN_OPTIONS="detect_leaks=1:log_path=$tmpdir/asan" diff --git a/.ci/common.sh b/.ci/common.sh index b27a756683..e83038c1a6 100644 --- a/.ci/common.sh +++ b/.ci/common.sh @@ -35,8 +35,12 @@ check_core_dumps() { done } -setup_prebuilt_deps() { - eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) deps-${1}" +setup_deps() { + if [ "$BUILD_NVIM_DEPS" != "true" ]; then + eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) deps-${1}" + elif [ "$TRAVIS_OS_NAME" = "linux" ]; then + sudo apt-get install libtool + fi } tmpdir="$(pwd)/tmp" diff --git a/.ci/gcc-32.sh b/.ci/gcc-32.sh index 8b3cdcf3fc..56f972bd1a 100644 --- a/.ci/gcc-32.sh +++ b/.ci/gcc-32.sh @@ -1,7 +1,5 @@ . "$CI_SCRIPTS/common.sh" -setup_prebuilt_deps x86 - # Need this to keep apt-get from removing gcc when installing libncurses # below. sudo apt-get install libc6-dev libc6-dev:i386 @@ -14,16 +12,19 @@ sudo apt-get install gcc-multilib g++-multilib # correctly. sudo apt-get install libncurses5-dev:i386 +setup_deps x86 + CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ -DCMAKE_SYSTEM_PROCESSOR=i386 \ -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \ - -DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake \ -DBUSTED_OUTPUT_TYPE=plainTerminal" # Build and output version info. -$MAKE_CMD CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim +$MAKE_CMD DEPS_CMAKE_FLAGS="$CMAKE_EXTRA_FLAGS" \ + CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS" nvim build/bin/nvim --version # Build library. diff --git a/.ci/gcc.sh b/.ci/gcc.sh index 188cf5e5e8..07cd522b23 100644 --- a/.ci/gcc.sh +++ b/.ci/gcc.sh @@ -11,7 +11,7 @@ else exit 1 fi -setup_prebuilt_deps x64 +setup_deps x64 export VALGRIND=1 export VALGRIND_LOG="$tmpdir/valgrind-%p.log" diff --git a/.travis.yml b/.travis.yml index 02cd32ee35..37d1dd978c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ os: env: global: - CI_SCRIPTS=$TRAVIS_BUILD_DIR/.ci + # To build third-party dependencies, set this to 'true'. + - BUILD_NVIM_DEPS=false # Travis reports back that it has 32-cores via /proc/cpuinfo, but it's not # what we really have available. According to their documentation, it only has # 1.5 virtual cores. |