travis: use new ROOT builds

scikit-hep · May 19, 2015 · 0d35b7c · 0d35b7c
1 parent 21d8df4
commit 0d35b7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
     - "2.7"
     - "3.4"
 env:
-    - ROOT=v5-34-18
+    - ROOT=5.34.18
     - ROOT=master COVERAGE=1
 install: source ci/install.sh
 script: bash ci/test.sh

diff --git a/ci/install.sh b/ci/install.sh
@@ -17,12 +17,12 @@ sudo apt-get -qq install python-nose python-pip
 pip install coverage coveralls
 
 # Install the ROOT binary
-build=root${ROOT}_python${TRAVIS_PYTHON_VERSION}_gcc4.8_x86_64
+ROOT_BUILD=ROOT-${ROOT}_Python-${TRAVIS_PYTHON_VERSION}_GCC-4.8_x86_64
 if [ ! -z ${NOTMVA+x} ]; then
     # Use a build without TMVA
-    build+=_notmva
+    ROOT_BUILD+=_notmva
 fi
-time wget --no-check-certificate https://copy.com/rtIyUdxgjt7h/ci/root_builds/${build}.tar.gz
-time tar zxf ${build}.tar.gz
-mv ${build} root
+time wget --no-check-certificate https://copy.com/rtIyUdxgjt7h/ci/root_builds/${ROOT_BUILD}.tar.gz
+time tar zxf ${ROOT_BUILD}.tar.gz
+mv ${ROOT_BUILD} root
 source root/bin/thisroot.sh