X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=.travis.yml;h=4ba4e2a6d4bc4cb50dc5f5cfb7abe7c16a429fa4;hp=707e6b1aca7e2bd332a4f37c786e79552aaeac2e;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=2ff331728af193c67acf333272180729ef13c11e

diff --git a/.travis.yml b/.travis.yml
index 707e6b1a..4ba4e2a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,39 @@
 # Travis CI configuration file
 # https://travis-ci.org/collectd/collectd
+language: c
+
 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: "ZdWWp0XX3C4sLIp4lqeQTWC7vt+GsWjmyRiD17T9833NBAW4dddz310I6iyeXe6oX09ZFFiVIN4ogx9ANcNBx9jriGXI2/82nBhpxOJBebet8JCNS5VeTr4rDSfQOKP+Oc+ko5KbbghTuAtO2CFYiH3jZUcn4TdsYbVanf+TwUs="
+    - MAKEFLAGS="-j 2"
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    # via the "travis encrypt" command using the project repo's public key
+    - secure: "ZdWWp0XX3C4sLIp4lqeQTWC7vt+GsWjmyRiD17T9833NBAW4dddz310I6iyeXe6oX09ZFFiVIN4ogx9ANcNBx9jriGXI2/82nBhpxOJBebet8JCNS5VeTr4rDSfQOKP+Oc+ko5KbbghTuAtO2CFYiH3jZUcn4TdsYbVanf+TwUs="
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10.1
+      compiler: clang
+      env:
+        - CXX=clang++
+        - PATH="/usr/local/opt/mysql-client/bin:$PATH"
+    - os: linux
+      dist: xenial
+      compiler: clang
+    - os: linux
+      dist: xenial
+      compiler: gcc
 
-dist: xenial
-os:
-  - linux
-  - osx
-compiler:
-  - gcc
-  - clang
-language: c
 before_install:
   # When building the coverity_scan branch, allow only the first job to continue to avoid travis-ci/travis-ci#1975.
   - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" && ! "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then exit 0; fi
-before_script: autoreconf -fi
+
+before_script: autoreconf -vif
+
 script:
   - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi
   - ./configure
-  - make distcheck
+  - make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
 
 addons:
   apt:
@@ -49,7 +61,7 @@ addons:
     - libmicrohttpd-dev
     - libmnl-dev
     - libmodbus-dev
-    - libmosquitto0-dev
+    - libmosquitto-dev
     - libmysqlclient-dev
     - libnotify-dev
     - libopenipmi-dev
@@ -114,9 +126,15 @@ addons:
     - protobuf
     - protobuf-c
     - python
+    - qpid-proton
     - rabbitmq-c
     - riemann-client
     - rrdtool
     - tokyo-cabinet
     - varnish
     - yajl
+
+git:
+  quiet: true
+  submodules: false
+  depth: 1