summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeff Donahue <jeff.donahue@gmail.com>2014-09-08 11:11:41 +0200
committerJeff Donahue <jeff.donahue@gmail.com>2014-09-11 17:13:28 +0200
commit4ce6e43140819588d2e47c22ca13c05a8030f57d (patch)
tree8e9395db858cbc7bb7cbf82c8b2fb84ff88f80ab /.travis.yml
parent15538f87992747bea2713801ef4abec5d0f4f50b (diff)
downloadcaffe-4ce6e43140819588d2e47c22ca13c05a8030f57d.tar.gz
caffe-4ce6e43140819588d2e47c22ca13c05a8030f57d.tar.bz2
caffe-4ce6e43140819588d2e47c22ca13c05a8030f57d.zip
restore "red X" build failures in Travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 46dfc117..3deb45a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,19 +16,16 @@ compiler: gcc
before_install:
- export NUM_THREADS=4
- - alias make="make --jobs=$NUM_THREADS"
- export SCRIPTS=./scripts/travis
- - set -e # fail when a script fails
install:
- - source $SCRIPTS/travis_install.sh
+ - sudo -E $SCRIPTS/travis_install.sh
before_script:
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
- - if ! $WITH_CMAKE; then source $SCRIPTS/travis_setup_makefile_config.sh; fi
+ - if ! $WITH_CMAKE; then $SCRIPTS/travis_setup_makefile_config.sh; fi
-script:
- - if $WITH_CUDA; then source $SCRIPTS/travis_build.sh; else source $SCRIPTS/travis_build_and_test.sh; fi
+script: $SCRIPTS/travis_build_and_test.sh
notifications:
# Emails are sent to the committer's git-configured email address by default,