diff --git a/.travis.yml b/.travis.yml index 7b69d8ab2..8b78459ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,8 +133,8 @@ matrix: script: - mkdir build - cd build - - source ../tools/install_deps.sh - - source ../tools/install_travis.sh + - bash ../tools/install_deps.sh + - bash ../tools/install_travis.sh notifications: email: false diff --git a/tools/install_deps.sh b/tools/install_deps.sh index 655ecfb9e..4665c491d 100644 --- a/tools/install_deps.sh +++ b/tools/install_deps.sh @@ -13,8 +13,8 @@ if [[ "${PAGMO_BUILD}" != manylinux* ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh; fi export deps_dir=$HOME/local - bash miniconda.sh -b -p $HOME/miniconda export PATH="$HOME/miniconda/bin:$PATH" + bash miniconda.sh -b -p $HOME/miniconda conda config --add channels conda-forge --force conda_pkgs="boost>=1.55 cmake>=3.2 eigen nlopt ipopt" diff --git a/tools/install_travis.sh b/tools/install_travis.sh index 9506b260d..c48c9a3ba 100644 --- a/tools/install_travis.sh +++ b/tools/install_travis.sh @@ -7,6 +7,8 @@ set -x set -e if [[ "${PAGMO_BUILD}" != manylinux* ]]; then + export deps_dir=$HOME/local + export PATH="$HOME/miniconda/bin:$PATH" export PATH="$deps_dir/bin:$PATH" fi