script: report also timing file, do it only once

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

diff --git a/.travis.yml b/.travis.yml
index 25eed08cab61a0d41b9ceb2fa29445351378850a..a4f51f3ed0e02b63ef84dbc40630b7e3a0ca00bb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: c
 
+sudo: required
+dist: trusty
+
 git:
   depth: 1500
 
@@ -8,20 +11,35 @@ compiler:
   - clang
 
 env:
-  global:
-  # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-  # via the "travis encrypt" command using the project repo's public key
-  - secure: "X5xVT8S0hsnT5cyDzmQbKr68kunpI1VyNADD/bMcEjPiBO2p6/iWHSfAqRP3q2UEqt92XgwCd8cuSVffdagbin4JlvA5fgnCWkcCphC8k79jhHqz9aoK97qbSXBHLU4yDimeC/m9HlslBc/zjPAc+s9/7UKBXQI+YN9ITL1i7pQ="
   - 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:
+  # print some host info
+  - env | grep -v "encrypted" | LC_ALL=C sort
+  # workaround travis-ci issue #5301
+  - unset PYTHON_CFLAGS
+
 install:
   - source ./.travis-functions.sh
   - travis_install_script
@@ -35,18 +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`
-
-addons:
-  coverity_scan:
-    project:
-      name: "karelzak/util-linux"
-      description: "Build submitted via Travis CI"
-      notification_email: kzak@redhat.com
-      build_command_prepend: travis_before_script
-      build_command: "make"
-      branch_pattern: coverity_scan