diff options
author | Alan Antonuk <alan.antonuk@gmail.com> | 2015-06-06 23:20:20 -0700 |
---|---|---|
committer | Alan Antonuk <alan.antonuk@gmail.com> | 2015-06-06 23:20:20 -0700 |
commit | 94685b72dfa968b5f8cf9d0e1fec53e3f3fdfb79 (patch) | |
tree | 9f71ad456e52cb6a1f1b75b50c821dbe26398ae1 | |
parent | 91db548a93f2ba09b4d1f168f247c89731932a5a (diff) | |
download | rabbitmq-c-94685b72dfa968b5f8cf9d0e1fec53e3f3fdfb79.tar.gz |
ci: simplify travis config.
-rw-r--r-- | .travis.yml | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 3267b8d..fd74312 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,23 @@ # Travis-CI Build for rabbitmq-c # see travis-ci.org for details -# As CMake is not officially supported we use erlang VMs language: c +# Need to install libpopt-dev for tools build. Can use the container-based +# builds on travis once https://github.com/travis-ci/travis-ci/issues/3887 has +# been resolved. +sudo: required + compiler: - gcc - clang +# OSX isn't actually enabled at this point as we missed the boat. Hopefully +# they re-open sign-ups for OSS projects sometime soon. +os: + - linux + - osx + # Settings to try env: global: @@ -15,38 +25,17 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: "gDwqo3jHj+HHGzFKnxL/nwZhbVeh2pItw0TbeaHcLtWubUZaf85ViEQRaXPyfnbG7l0OEQq+PjyhKAfvViVq2NP0lGeeu4VM5uMZJhsCLN594BJr39Y4XzOapg0O8mEMhQ0DU2u1Zo4LMgEcRz67aosVQOj6QV30tOzp9fnxn9U=" matrix: - - BUILD_SYSTEM=cmake - - BUILD_SYSTEM=autotools + - CONFIG=cmake + - CONFIG=autotools # Make sure CMake is installed install: - - sudo apt-get install cmake libpopt-dev - -before_script: - - mkdir _build - - cd _build + - sudo apt-get update -qq + - sudo apt-get install -qq libpopt-dev # Run the Build script script: - - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then - case $BUILD_SYSTEM in - cmake) - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/_install && - cmake --build . --target install - ;; - autotools) - cd .. && - autoreconf -i && - cd _build && - ../configure --prefix=`pwd`/_install && - make install - ;; - esac ; - fi - -# Run Tests -after_script: -- if [ -f CTestTestfile.cmake ]; then ctest -V . ; fi + - ./travis.sh $CONFIG addons: coverity_scan: |