travis: adding additional build with os x 10.10

catkin · Apr 22, 2016 · 997a064 · 997a064
1 parent 5077b15
commit 997a064
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.travis.before_install.bash b/.travis.before_install.bash
@@ -6,8 +6,12 @@ elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
   if [ "$PYTHON" == "/usr/local/bin/python3" ]; then
     brew install python3
     brew install enchant
+    sudo pip3 install virtualenv
+  else
+    brew install python
+    brew install enchant
+    sudo pip install virtualenv
   fi
-  sudo pip install virtualenv
   virtualenv -p $PYTHON venv
   source venv/bin/activate
 fi
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,14 @@ matrix:
     - os: osx
       python: 3
       env: PYTHON=/usr/local/bin/python3 CATKIN_VERSION=indigo-devel
+    - os: osx
+      osx_image: xcode7.1
+      python: 2
+      env: PYTHON=/usr/bin/python CATKIN_VERSION=indigo-devel
+    - os: osx
+      osx_image: xcode7.1
+      python: 3
+      env: PYTHON=/usr/local/bin/python3 CATKIN_VERSION=indigo-devel
 before_install:
   # Install catkin_tools dependencies
   - source .travis.before_install.bash