Install sh in travis.yml. Disable OS X for now

apache · Jan 5, 2016 · d5f2d6f · d5f2d6f
1 parent 53f73c0
commit d5f2d6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,8 @@ compiler:
 
 os:
     - linux
-    - osx
+
+#    - osx
 
 addons:
     apt:
@@ -16,6 +17,10 @@ addons:
             - flex                         #needed for thrift cpp compilation
             - pkg-config                   #needed for thrift cpp compilation
 
+# command to install dependencies
+install:
+	- pip install sh
+
 before_install:
     - ./build-support/travis-setup.sh
 

diff --git a/build-support/travis-setup.sh b/build-support/travis-setup.sh
@@ -2,7 +2,6 @@
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
 	export NATIVE_TOOLCHAIN=`pwd`/toolchain
-	pip install sh
 	./build-support/linux-toolchain.py
 fi