X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.travis.yml;h=a4f51f3ed0e02b63ef84dbc40630b7e3a0ca00bb;hb=4a4f4a6260dec16b849125458bd3668a82f6db49;hp=b01fc8cfc2cbc8bfda2a70b900130c1cac6ea2a8;hpb=d9f0a6b09191cbe2a0973b2071b746aa0ce55397;p=thirdparty%2Futil-linux.git

diff --git a/.travis.yml b/.travis.yml
index b01fc8cfc2..a4f51f3ed0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,55 @@
 language: c
 
+sudo: required
+dist: trusty
+
+git:
+  depth: 1500
+
 compiler:
   - gcc
   - clang
 
+env:
+  - MAKE_CHECK="nonroot"
+  - 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:
-  - sudo apt-get -qq update
+  # print some host info
+  - env | grep -v "encrypted" | LC_ALL=C sort
+  # workaround travis-ci issue #5301
+  - unset PYTHON_CFLAGS
 
 install:
-  - sudo apt-get install -qq autopoint
-  - sudo apt-get install -qq bc
-  - sudo apt-get install -qq gtk-doc-tools
+  - source ./.travis-functions.sh
+  - travis_install_script
 
 before_script:
-  - ./autogen.sh
+  - travis_before_script
 
 script:
-  - ./configure
-    && make
-    && make check
-    && make dist
+  - travis_script
 
 after_script:
-  - test -d tests/diff
-    && echo "cat test diffs:"
-    && find tests/diff -type f | xargs -r cat
+  - travis_after_script
+