projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3350 from qingling128/master
[collectd.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index
231f704
..
45fb898
100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-14,15
+14,19
@@
matrix:
- os: osx
osx_image: xcode11.2
compiler: clang
- os: osx
osx_image: xcode11.2
compiler: clang
+ jdk: openjdk10
env:
- CXX=clang++
- PATH="/usr/local/opt/mysql-client/bin:$PATH"
env:
- CXX=clang++
- PATH="/usr/local/opt/mysql-client/bin:$PATH"
+ - JAVA_HOME="/Library/Java/JavaVirtualMachines/openjdk-13.jdk/Contents/Home"
- os: linux
dist: xenial
compiler: clang
- os: linux
dist: xenial
compiler: clang
+ jdk: openjdk10
- os: linux
dist: xenial
compiler: gcc
- os: linux
dist: xenial
compiler: gcc
+ jdk: openjdk10
before_install:
# When building the coverity_scan branch, allow only the first job to continue to avoid travis-ci/travis-ci#1975.
before_install:
# When building the coverity_scan branch, allow only the first job to continue to avoid travis-ci/travis-ci#1975.
@@
-33,8
+37,9
@@
before_script: autoreconf -vif
script:
- if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi
- type pkg-config
script:
- if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi
- type pkg-config
- - pkg-config --list-all
+ - pkg-config --list-all
| sort -u
- ./configure
- ./configure
+ - cat config.log
- make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
addons:
- make distcheck DISTCHECK_CONFIGURE_FLAGS="--disable-dependency-tracking --enable-debug"
addons:
@@
-58,7
+63,6
@@
addons:
- liblua50-dev
- liblua5.1-0-dev
- liblua5.2-dev
- liblua50-dev
- liblua5.1-0-dev
- liblua5.2-dev
- - liblvm2-dev
- libmemcached-dev
- libmicrohttpd-dev
- libmnl-dev
- libmemcached-dev
- libmicrohttpd-dev
- libmnl-dev
@@
-80,7
+84,6
@@
addons:
- libsensors4-dev
- libsigrok-dev
- libsnmp-dev
- libsensors4-dev
- libsigrok-dev
- libsnmp-dev
- - libstatgrab-dev
- libtokyocabinet-dev
- libtokyotyrant-dev
- libudev-dev
- libtokyocabinet-dev
- libtokyotyrant-dev
- libudev-dev
@@
-117,9
+120,10
@@
addons:
- liboping
- libpcap
- librdkafka
- liboping
- libpcap
- librdkafka
- - libstatgrab
- libvirt
- libvirt
+ - libxml2
- lua
- lua
+ - mongo-c-driver
- mosquitto
- mysql-client
- net-snmp
- mosquitto
- mysql-client
- net-snmp