From 5675d5037fd95f89e7ada72301ceee37a281463d Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Mon, 11 Apr 2016 16:46:55 -0700 Subject: [PATCH] Revert travis commit Summary: Revert travis commit pushed unintentionally Test Plan: none Subscribers: andrewkr, dhruba Differential Revision: https://reviews.facebook.net/D56559 --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f637ca023..b045d259e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,6 @@ sudo: false language: cpp matrix: - - JOB_NAME=unittests - - JOB_NAME=jtest - - JOB_NAME=lite_build - include: - os: linux compiler: clang @@ -38,9 +34,7 @@ before_script: # as EnvPosixTest::AllocateTest expects within the Travis OpenVZ environment. script: - if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then OPT=-DTRAVIS CLANG_FORMAT_DIFF=/tmp/clang-format-diff.py make format || true; fi - - if [[ "${JOB_NAME}" == 'unittests' ]]; then OPT=-DTRAVIS V=1 make -j4 check; fi - - if [[ "${JOB_NAME}" == 'jtest' ]]; then OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest; fi - - if [[ "${JOB_NAME}" == 'lite_build' ]]; then OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib; fi + - OPT=-DTRAVIS V=1 make -j4 check && OPT=-DTRAVIS V=1 make clean jclean rocksdbjava jtest && make clean && OPT="-DTRAVIS -DROCKSDB_LITE" V=1 make -j4 static_lib notifications: email: