summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2012-07-31 10:17:22 -0700
committerVicent Martí <vicent@github.com>2012-07-31 10:17:22 -0700
commit0565e7bdc44a15e3f3ce25ca480458b466c837aa (patch)
tree38b7c9ac921390ca6d5dfa02f77bd2f558cb8b5f
parentbfb59164687408bcc61b9b75bb391770fae7d9c2 (diff)
parent034ccc76a6269519276ead867d4c06c8c91f2a6a (diff)
downloadlibgit2-0565e7bdc44a15e3f3ce25ca480458b466c837aa.tar.gz
Merge pull request #837 from carlosmn/travis
travis: be more idiomatic with the environment
-rw-r--r--.travis.yml25
1 files changed, 18 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index caead67b1..29ef9d40d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,22 @@
# see travis-ci.org for details
# As CMake is not officially supported we use erlang VMs
-language: erlang
+language: c
+
+compiler:
+ - gcc
+ - clang
# Settings to try
env:
- - CC=gcc OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
- - CC=clang OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
- - CC=gcc OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=ON"
- - CC=clang OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=ON"
- - CC=i586-mingw32msvc-gcc OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON"
-
+ - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
+ - OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=ON"
+
+matrix:
+ include:
+ - compiler: i586-mingw32msvc-gcc
+ env: OPTIONS="-DBUILD_CLAR=OFF -DWIN32=ON -DMINGW=ON"
+
# Make sure CMake is installed
install:
- sudo apt-get install cmake valgrind
@@ -35,6 +41,11 @@ branches:
# Notify development list when needed
notifications:
+ irc:
+ channels:
+ - irc.freenode.net#libgit2
+ on_success: change
+ on_failure: always
recipients:
- vicent@github.com
email: