From 2b676d5bbefc974f747e2d7eb62b757a760fa535 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Wed, 9 Sep 2015 17:55:33 -0700 Subject: [PATCH] Upgrade travis to new architecture --- .travis.yml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca8bdda19..f38d0ca4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,25 @@ +sudo: false +os: + - linux language: cpp -compiler: gcc -before_install: -# As of this writing (10 May 2014) the Travis build environment is Ubuntu 12.04, -# which needs the following ugly dependency incantations to build RocksDB: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq - - sudo apt-get install -y -qq gcc-4.9 g++-4.9 zlib1g-dev libbz2-dev libsnappy-dev - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 50 - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 50 - - wget https://gflags.googlecode.com/files/libgflags0_2.0-1_amd64.deb - - sudo dpkg -i libgflags0_2.0-1_amd64.deb - - wget https://gflags.googlecode.com/files/libgflags-dev_2.0-1_amd64.deb - - sudo dpkg -i libgflags-dev_2.0-1_amd64.deb +compiler: clang +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - zlib1g-dev + - libbz2-dev + - libsnappy-dev + - clang-3.6 + +env: COMPILER=clang++-3.6 + # Lousy hack to disable use and testing of fallocate, which doesn't behave quite # as EnvPosixTest::AllocateTest expects within the Travis OpenVZ environment. -script: OPT=-DTRAVIS V=1 make unity && make clean && OPT=-DTRAVIS V=1 make db_test && ./db_test && OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest +script: CXX=$COMPILER OPT=-DTRAVIS V=1 make unity && make clean && CXX=$COMPILER OPT=-DTRAVIS V=1 make db_test && ./db_test && CXX=$COMPILER OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest notifications: email: false + webhooks: + - https://buildtimetrend.herokuapp.com/travis