diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-12 09:54:03 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-12 09:54:03 -0400 |
| commit | 5ca1f974620fd8922aba4bde2a318ad8bf3a9d51 (patch) | |
| tree | db7e8a1894553e3adec6f1c61a333935f48b8b58 | |
| parent | 32543726026e245dd2a6238c6730c646945e2a48 (diff) | |
| parent | 579e0baba03482e3b1f9a83cdb54c1b8871eb5e2 (diff) | |
| download | rneovim-5ca1f974620fd8922aba4bde2a318ad8bf3a9d51.tar.gz rneovim-5ca1f974620fd8922aba4bde2a318ad8bf3a9d51.tar.bz2 rneovim-5ca1f974620fd8922aba4bde2a318ad8bf3a9d51.zip | |
Merge pull request #1037 from fwalch/automatic-deps-paths
Travis: Add subdirectories to dependency paths.
| -rw-r--r-- | .ci/api-python.sh | 2 | ||||
| -rw-r--r-- | .ci/clang-asan.sh | 2 | ||||
| -rw-r--r-- | .ci/common.sh | 2 | ||||
| -rw-r--r-- | .ci/gcc-unittest.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.ci/api-python.sh b/.ci/api-python.sh index 556361cb96..a3e9b652a6 100644 --- a/.ci/api-python.sh +++ b/.ci/api-python.sh @@ -1,6 +1,6 @@ . "$CI_SCRIPTS/common.sh" -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo apt-get install expect valgrind diff --git a/.ci/clang-asan.sh b/.ci/clang-asan.sh index 3217f754d6..4b5ff26d0d 100644 --- a/.ci/clang-asan.sh +++ b/.ci/clang-asan.sh @@ -2,7 +2,7 @@ install_vroom -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo pip install cpp-coveralls diff --git a/.ci/common.sh b/.ci/common.sh index a31b3063e9..09a6e24b9d 100644 --- a/.ci/common.sh +++ b/.ci/common.sh @@ -48,7 +48,7 @@ asan_check() { } set_environment() { - local prefix="$1" + local prefix="$1/usr" eval $($prefix/bin/luarocks path) export PATH="$prefix/bin:$PATH" export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" diff --git a/.ci/gcc-unittest.sh b/.ci/gcc-unittest.sh index a4e4a6f35f..cb4e75ae65 100644 --- a/.ci/gcc-unittest.sh +++ b/.ci/gcc-unittest.sh @@ -1,6 +1,6 @@ . "$CI_SCRIPTS/common.sh" -set_environment /opt/neovim-deps +set_environment /opt/neovim-deps/64 sudo pip install cpp-coveralls |