diff options
author | Alan Antonuk <alan.antonuk@gmail.com> | 2017-07-11 23:20:04 -0700 |
---|---|---|
committer | Alan Antonuk <alan.antonuk@gmail.com> | 2017-07-12 23:36:14 -0700 |
commit | b9eabbae2e312734b034d7588f03901ca76d158e (patch) | |
tree | a262174776afee3c88a9d05a189b044adbba7b75 | |
parent | 67264053434fa772bd082f9f5ce578fc1ddd9855 (diff) | |
download | rabbitmq-c-b9eabbae2e312734b034d7588f03901ca76d158e.tar.gz |
ci: build on trusty (14.04) on travis-ci.trusty
precise (12.04) is EOL'd and scheduled to be turned down by the travis
folks in the next couple months.
Note that this switches back to VM-based system, as the libpopt-dev
package isn't available yet.
-rw-r--r-- | .travis.yml | 25 | ||||
-rwxr-xr-x | travis.sh | 4 |
2 files changed, 13 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index a94c9f5..634f4ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ language: c -# Use the faster container-based infrastructure. -sudo: false +dist: trusty +# Currently libpopt-dev is not on the list of whitelisted apt-packages. +sudo: true env: global: @@ -43,6 +44,13 @@ matrix: env: CONFIG=tsan before_install: + - | + if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then + wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" + sudo apt-get -q update; + sudo apt-get install -y clang-3.9 libpopt-dev; + fi # ugly hack; if running a coverity scan abort all except the 1st build # see note re gcc compiler above needing to be 1st # also note that branch_pattern & the TRAVIS_BRANCH check must match @@ -50,23 +58,12 @@ before_install: # build process - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi + script: # Don't bother building if this is being done in the coverity_scan branch. - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./travis.sh $CONFIG ; fi addons: - apt: - # List of whitelisted in travis packages for ubuntu-precise can be found here: - # https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise - # List of whitelisted in travis apt-sources: - # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - libpopt-dev - - clang-3.7 - coverity_scan: project: name: "alanxz/rabbitmq-c" @@ -33,10 +33,10 @@ build_tsan() { build_scan-build() { mkdir $PWD/_build && cd $PWD/_build - scan-build-3.7 cmake .. -DCMAKE_BUILD_TYPE=Debug \ + scan-build-3.9 cmake .. -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ -DCMAKE_C_FLAGS="-Werror" - scan-build-3.7 make install + scan-build-3.9 make install } if [ "$#" -ne 1 ]; then |