From 1c9fb47a6bfccc3a9d0c563db496f34a369f94f1 Mon Sep 17 00:00:00 2001 From: Gabriele Contini <gcontini@users.noreply.github.com> Date: 周日, 01 9月 2019 13:42:20 +0800 Subject: [PATCH] Merge pull request #39 from open-license-manager/gcontini-libbboost-date-time --- .travis.yml | 53 ++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f1dabe..ebed1dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,42 @@ language: cpp -branches: - only: - - master - -before_install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake - - sudo apt-get update -qq - - sudo apt-get install cmake doxygen valgrind > /dev/null - - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; echo "+++GCC4.8"; fi - +matrix: + include: + - os: linux + dist: bionic + addons: + apt: + packages: + - cmake + - valgrind + - libssl-dev + - zlib1g-dev + - libboost-test-dev + - libboost-filesystem-dev + - libboost-iostreams-dev + - libboost-program-options-dev + - libboost-system-dev + - libboost-thread-dev + - libboost-date-time-dev + - os: linux + dist: xenial + addons: + apt: + packages: + - cmake + - valgrind + - libssl-dev + - zlib1g-dev + - libboost-test-dev + - libboost-filesystem-dev + - libboost-iostreams-dev + - libboost-program-options-dev + - libboost-system-dev + - libboost-thread-dev + - libboost-date-time-dev + before_script: - - cd build/linux && cmake ../.. + - mkdir build + - cd build && cmake .. script: - - make \ No newline at end of file + - make -- Gitblit v1.9.1