]> git.madduck.net Git - etc/vim.git/blobdiff - .travis.yml

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge remote-tracking branch 'upstream/master'
[etc/vim.git] / .travis.yml
index fde06587e743fe7fbd8d21bb14be6d199f671805..90cc371b1ac2ce06df82e2c391393a166c6a24f3 100644 (file)
@@ -1,12 +1,19 @@
 language: vim
+
+os:
+  - linux
+  - osx
+
 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
@@ -17,10 +24,11 @@ before_script: |
     export PATH="/usr/local/bin:$PATH"
     cd "$TRAVIS_BUILD_DIR"
   fi
-  sudo pip install virtualenv
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    sudo -H easy_install pip
+  fi
+  sudo -H pip install virtualenv
 
 script:
-  - stty cols 80
-  - export COLUMNS=80
   - make test
   - make doc