X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.travis.yml;h=a4f51f3ed0e02b63ef84dbc40630b7e3a0ca00bb;hb=2e5ff9db30ba4bf70f2df8b37ee28c3805c28ed3;hp=e27adc4d7bf9296611c326c41a5873a133e8d7bd;hpb=45c9a3d27ffc22139bc9453a58cf786613acf0f9;p=thirdparty%2Futil-linux.git

diff --git a/.travis.yml b/.travis.yml
index e27adc4d7b..a4f51f3ed0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: c
 
+sudo: required
+dist: trusty
+
 git:
   depth: 1500
 
@@ -12,19 +15,28 @@ env:
   - MAKE_CHECK="root"
   - MAKE_CHECK="dist"
 
+matrix:
+  include:
+    # test old Ubuntu 12.04 and OSX for compatibility
+    - dist: precise
+      compiler: gcc
+      env: PRECISE="yes" MAKE_CHECK="root"
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: MAKE_CHECK="root"
+
 branches:
   only:
     - master
+    - next
     - /^stable.*/
+    - /^topic.*/
     - /^travis.*/
 
 before_install:
   # print some host info
   - env | grep -v "encrypted" | LC_ALL=C sort
-  - $CC --version
-  - which $CC
-  # workaround clang not system wide, fail on sudo make install
-  - export CC=`which $CC`
   # workaround travis-ci issue #5301
   - unset PYTHON_CFLAGS