Fix CI issues.

- Fix redirection issue when curling miniconda in ci. - Fix shell_session_update error on OS-X ci build
poppy-project · Jan 20, 2017 · a2177da · a2177da
1 parent 15e205d
commit a2177da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -74,6 +74,7 @@ addons:
       - dvipng
 
 before_install:
+  - rvm get head
   - . ./ci/before_install.sh
 
 install:

diff --git a/ci/before_install.sh b/ci/before_install.sh
@@ -33,9 +33,9 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     # Use miniconda python (provide binaries for scipy and numpy on Linux)
     if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-        curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
+        curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
     else
-        curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+        curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     fi
 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
@@ -48,9 +48,9 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
     # Use miniconda python (provide binaries for scipy and numpy on Linux)
     if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-        curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh
+        curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh
     else
-        curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
+        curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
     fi
 fi