From b688119aa480d81153cee037e27ca2933cda15d1 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Aug 2016 20:54:32 +0200 Subject: [PATCH] reverted .travis file --- .travis.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ddb2107..bd806cb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,26 +236,24 @@ install: # build script # ################ -script: | - if [[ "${SPECIAL}" == "" ]]; then - # show OS/compiler version - uname -a - $CXX --version - - # compile - make - - # execute unit tests - test/json_unit "*" - - # check if homebrew works (only checks develop branch) - if [ `which brew` ]; then - brew update ; - brew tap nlohmann/json ; - brew install nlohmann_json --HEAD ; - brew test nlohmann_json ; +script: + # show OS/compiler version + - uname -a + - $CXX --version + + # compile + - make + + # execute unit tests + - test/json_unit "*" + + # check if homebrew works (only checks develop branch) + - if [ `which brew` ]; then + brew update ; + brew tap nlohmann/json ; + brew install nlohmann_json --HEAD ; + brew test nlohmann_json ; fi - fi #language: cpp #