diff --git a/.travis.yml b/.travis.yml index bec5ffcff..f89e4da82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,14 @@ python: sudo: false env: global: - - MSCDIR=$TRAVIS_BUILD_DIR/misoc - - PATH=$HOME/miniconda/bin:/usr/local/llvm-or1k/bin:$PATH - BUILD_SOC=1 - secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws=" before_install: - mkdir -p $HOME/.mlabs - if [ $TRAVIS_PULL_REQUEST != false ]; then BUILD_SOC=0; fi + - if [ $BUILD_SOC -ne 0 ]; then . ./.travis/get-xilinx.sh; fi - . ./.travis/get-toolchain.sh - - if [ $BUILD_SOC -ne 0 ]; then ./.travis/get-xilinx.sh; fi - - ./.travis/get-anaconda.sh + - . ./.travis/get-anaconda.sh - source $HOME/miniconda/bin/activate py34 - conda install pip coverage binstar migen cython - pip install coveralls diff --git a/.travis/get-anaconda.sh b/.travis/get-anaconda.sh index 992c3d31a..6c7d7d098 100755 --- a/.travis/get-anaconda.sh +++ b/.travis/get-anaconda.sh @@ -1,5 +1,6 @@ #!/bin/sh +export PATH=$HOME/miniconda/bin:$PATH wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh bash miniconda.sh -b -p $HOME/miniconda hash -r