Merge branch 'master' into master

[etc/vim.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4a78b6f43db6385ddba5c884fd231642f98527ba..310e5034759d03d9deb8e14c022fe216fcfaae05 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,19 @@
 language: vim
 language: vim

+
+os:
+  - linux
+  - osx
+

 env:
   - TEST=package
   - TEST=latest
 
 before_script: |
   if [ "$TEST" = "package" ]; then
 env:
   - TEST=package
   - TEST=latest
 
 before_script: |
   if [ "$TEST" = "package" ]; then

-    sudo apt-get -y update
-    sudo apt-get -y install vim
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get -y update
+      sudo apt-get -y install vim
+    fi

   else
     cd ..
     git clone --depth 1 https://github.com/vim/vim
   else
     cd ..
     git clone --depth 1 https://github.com/vim/vim


@@ -17,6 +24,12 @@ before_script: |
     export PATH="/usr/local/bin:$PATH"
     cd "$TRAVIS_BUILD_DIR"
   fi
     export PATH="/usr/local/bin:$PATH"
     cd "$TRAVIS_BUILD_DIR"
   fi

+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    curl https://bootstrap.pypa.io/get-pip.py | sudo python
+    sudo -H easy_install pip
+  fi
+  sudo -H pip install virtualenv

 
 

-script: |
-  make test
+script:
+  - make test
+  - make doc