Travis: Add flag to force building of dependencies.

This commit is contained in:
Florian Walch 2014-11-28 23:23:12 +01:00
parent 2036fd8166
commit ddaa481236
5 changed files with 15 additions and 8 deletions

View File

@ -23,7 +23,7 @@ fi
export CC=/usr/local/clang-$clang_version/bin/clang export CC=/usr/local/clang-$clang_version/bin/clang
symbolizer=/usr/local/clang-$clang_version/bin/llvm-symbolizer symbolizer=/usr/local/clang-$clang_version/bin/llvm-symbolizer
setup_prebuilt_deps x64 setup_deps x64
export ASAN_SYMBOLIZER_PATH=$symbolizer export ASAN_SYMBOLIZER_PATH=$symbolizer
export ASAN_OPTIONS="detect_leaks=1:log_path=$tmpdir/asan" export ASAN_OPTIONS="detect_leaks=1:log_path=$tmpdir/asan"

View File

@ -35,8 +35,12 @@ check_core_dumps() {
done done
} }
setup_prebuilt_deps() { 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}" 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" tmpdir="$(pwd)/tmp"

View File

@ -1,7 +1,5 @@
. "$CI_SCRIPTS/common.sh" . "$CI_SCRIPTS/common.sh"
setup_prebuilt_deps x86
# Need this to keep apt-get from removing gcc when installing libncurses # Need this to keep apt-get from removing gcc when installing libncurses
# below. # below.
sudo apt-get install libc6-dev libc6-dev:i386 sudo apt-get install libc6-dev libc6-dev:i386
@ -14,16 +12,19 @@ sudo apt-get install gcc-multilib g++-multilib
# correctly. # correctly.
sudo apt-get install libncurses5-dev:i386 sudo apt-get install libncurses5-dev:i386
setup_deps x86
CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \
-DCMAKE_SYSTEM_PROCESSOR=i386 \ -DCMAKE_SYSTEM_PROCESSOR=i386 \
-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \ -DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \
-DFIND_LIBRARY_USE_LIB64_PATHS=OFF \ -DFIND_LIBRARY_USE_LIB64_PATHS=OFF \
-DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \ -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" -DBUSTED_OUTPUT_TYPE=plainTerminal"
# Build and output version info. # 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/bin/nvim --version
# Build library. # Build library.

View File

@ -11,7 +11,7 @@ else
exit 1 exit 1
fi fi
setup_prebuilt_deps x64 setup_deps x64
export VALGRIND=1 export VALGRIND=1
export VALGRIND_LOG="$tmpdir/valgrind-%p.log" export VALGRIND_LOG="$tmpdir/valgrind-%p.log"

View File

@ -4,6 +4,8 @@ os:
env: env:
global: global:
- CI_SCRIPTS=$TRAVIS_BUILD_DIR/.ci - 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 # 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 # what we really have available. According to their documentation, it only has
# 1.5 virtual cores. # 1.5 virtual cores.