From 79fd4dfbd861f0397bf47316a13876f5a3fd07b3 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Aug 2016 20:40:25 +0200 Subject: [PATCH 1/4] do not build for special cases --- .travis.yml | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd806cb89..053bd4360 100644 --- a/.travis.yml +++ b/.travis.yml @@ -237,24 +237,28 @@ install: ################ script: - # show OS/compiler version - - uname -a - - $CXX --version + - if [[ "${SPECIAL}" != "" ]]; then - # compile - - make + # show OS/compiler version + uname -a + $CXX --version - # execute unit tests - - test/json_unit "*" + # compile + make - # 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 ; + # 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 # #dist: trusty From 71af209ea90875fd4dc2a10fa6a8b11f800a911a Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Aug 2016 20:44:36 +0200 Subject: [PATCH 2/4] fix for YAML file --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 053bd4360..606e13893 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,19 +236,18 @@ install: # build script # ################ -script: - - if [[ "${SPECIAL}" != "" ]]; then - +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 ; @@ -256,7 +255,6 @@ script: brew install nlohmann_json --HEAD ; brew test nlohmann_json ; fi - fi #language: cpp From 29a4ef6c5cc06f25cf1cb3cf836fc9b4b170a50b Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Aug 2016 20:50:12 +0200 Subject: [PATCH 3/4] no execution for special cases --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 606e13893..9ddb21072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -237,7 +237,7 @@ install: ################ script: | - if [[ "${SPECIAL}" != "" ]]; then + if [[ "${SPECIAL}" == "" ]]; then # show OS/compiler version uname -a $CXX --version From b688119aa480d81153cee037e27ca2933cda15d1 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 22 Aug 2016 20:54:32 +0200 Subject: [PATCH 4/4] reverted .travis file --- .travis.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ddb21072..bd806cb89 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 #