rev: be careful with close()

[thirdparty/util-linux.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d8cbcc4e02defbed20c0c0385ca47a7da2cb2a0d..a4f51f3ed0e02b63ef84dbc40630b7e3a0ca00bb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: c
 
+sudo: required
+dist: trusty
+
 git:
   depth: 1500
 
@@ -12,25 +15,36 @@ 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
+  # workaround travis-ci issue #5301
+  - unset PYTHON_CFLAGS
 
 install:
-  # install some packages from Ubuntu's default sources
-  - sudo apt-get -qq update
-  - sudo apt-get install -qq
-    bc
-    dnsutils
-    libcap-ng-dev
-    libpam-dev
-    libudev-dev
-    gtk-doc-tools
-    ntp
+  - source ./.travis-functions.sh
+  - travis_install_script
 
 before_script:
-  - source ./.travis-functions.sh
   - travis_before_script
 
 script:
@@ -39,8 +53,3 @@ script:
 after_script:
   - travis_after_script
 
-before_install:
-  - $CC --version
-  - which $CC
-  # workaround clang not system wide, fail on sudo make install
-  - export CC=`which $CC`