From 3330a88a756876836129568cc1bd03c44ae31a76 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 14:49:54 +0200 Subject: [PATCH 1/9] refs #192 --- BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BUILD b/BUILD index 38b9582..74beb80 100755 --- a/BUILD +++ b/BUILD @@ -24,6 +24,12 @@ usage(){ exit 99 } +current_branch(){ + + git_current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` + echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, TRAVIS_TAG=$TRAVIS_TAG" +} + git_current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` if [ "$git_current_branch" == "master" ] From 5bb799ca40300d1d03c3b94770a614c06122f381 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 14:52:29 +0200 Subject: [PATCH 2/9] refs #192 --- BUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BUILD b/BUILD index 74beb80..76886aa 100755 --- a/BUILD +++ b/BUILD @@ -54,6 +54,8 @@ done cmake_args="$cmake_build_type $cmake_gcov_option $cmake_sonar_option" +current_branch + echo "##############################################################################" echo "#" echo "# Project: cpp-pthread" From 3652b8bc764794d99211d546f86e06543d56ef62 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 15:17:53 +0200 Subject: [PATCH 3/9] refs #192 Travis checks --- BUILD | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/BUILD b/BUILD index 76886aa..4456660 100755 --- a/BUILD +++ b/BUILD @@ -24,15 +24,24 @@ usage(){ exit 99 } -current_branch(){ +echo "TRAVIS_TAG: $TRAVIS_TAG" - git_current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, TRAVIS_TAG=$TRAVIS_TAG" +get_current_branch(){ + + if [ -z "$TRAVIS_BRANCH" ] + then + current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` + else + [ -z "$TRAVIS_TAG" ] && current_branch=$TRAVIS_BRANCH || current_branch="master" + fi + + echo -n "$current_branch" } -git_current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` +current_branch=`get_current_branch` +echo "BRANCH: $current_branch" -if [ "$git_current_branch" == "master" ] +if [ "$current_branch" == "master" ] then cmake_build_type="-DCMAKE_BUILD_TYPE=Release" else @@ -54,7 +63,7 @@ done cmake_args="$cmake_build_type $cmake_gcov_option $cmake_sonar_option" -current_branch +get_current_branch echo "##############################################################################" echo "#" @@ -62,7 +71,7 @@ echo "# Project: cpp-pthread" echo "# Build date: `date`" echo "# Build directory: $cmake_build_dir" echo "# Build options: $cmake_args" -echo "# GIT current branch: [$git_current_branch]" +echo "# GIT current branch: [$current_branch]" echo "#" echo "##############################################################################" From 9ead0fcda0a684b486b9964e5ce07961c2308075 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 15:21:54 +0200 Subject: [PATCH 4/9] refs #192 --- BUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BUILD b/BUILD index 4456660..0c7f93b 100755 --- a/BUILD +++ b/BUILD @@ -32,6 +32,7 @@ get_current_branch(){ then current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` else + echo "ON TRAVIS >>>>>>>>>>" [ -z "$TRAVIS_TAG" ] && current_branch=$TRAVIS_BRANCH || current_branch="master" fi @@ -67,6 +68,8 @@ get_current_branch echo "##############################################################################" echo "#" +[ ! -z "$TRAVIS_BRANCH" ] && echo "# Running on Travis" +echo "#" echo "# Project: cpp-pthread" echo "# Build date: `date`" echo "# Build directory: $cmake_build_dir" From ae27f830b4229587858199c8d1674a8caee4b613 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 15:30:02 +0200 Subject: [PATCH 5/9] refs #192 --- BUILD | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/BUILD b/BUILD index 0c7f93b..87cf8c1 100755 --- a/BUILD +++ b/BUILD @@ -24,23 +24,16 @@ usage(){ exit 99 } -echo "TRAVIS_TAG: $TRAVIS_TAG" - -get_current_branch(){ - +set_current_branch(){ if [ -z "$TRAVIS_BRANCH" ] then current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` else - echo "ON TRAVIS >>>>>>>>>>" [ -z "$TRAVIS_TAG" ] && current_branch=$TRAVIS_BRANCH || current_branch="master" fi - - echo -n "$current_branch" } -current_branch=`get_current_branch` -echo "BRANCH: $current_branch" +set_current_branch if [ "$current_branch" == "master" ] then @@ -64,12 +57,9 @@ done cmake_args="$cmake_build_type $cmake_gcov_option $cmake_sonar_option" -get_current_branch - echo "##############################################################################" echo "#" -[ ! -z "$TRAVIS_BRANCH" ] && echo "# Running on Travis" -echo "#" +[ ! -z "$TRAVIS_BRANCH" ] && echo "# Running on Travis ($TRAVIS_BRANCH, $TRAVIS_TAG)" echo "# Project: cpp-pthread" echo "# Build date: `date`" echo "# Build directory: $cmake_build_dir" From 1d379e6592abc22f941a265ce80d3bc243fbb1d3 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 15:36:00 +0200 Subject: [PATCH 6/9] refs #192 Handle TRAVIS_PULL_REQUEST_BRANCH and TRAVIS_BRANCH --- BUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 87cf8c1..628f722 100755 --- a/BUILD +++ b/BUILD @@ -29,7 +29,12 @@ set_current_branch(){ then current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1` else - [ -z "$TRAVIS_TAG" ] && current_branch=$TRAVIS_BRANCH || current_branch="master" + if [ -z "$TRAVIS_TAG" ] + then + [ -z "$TRAVIS_PULL_REQUEST_BRANCH" ] && current_branch=$TRAVIS_BRANCH || current_branch=$TRAVIS_PULL_REQUEST_BRANCH + else + current_branch="master" + fi fi } From 2b742dce7696ec43c187b2c58ba32e88fe4d6e78 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 15:39:39 +0200 Subject: [PATCH 7/9] refs #192 better output messages --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 628f722..2f82620 100755 --- a/BUILD +++ b/BUILD @@ -64,7 +64,7 @@ cmake_args="$cmake_build_type $cmake_gcov_option $cmake_sonar_option" echo "##############################################################################" echo "#" -[ ! -z "$TRAVIS_BRANCH" ] && echo "# Running on Travis ($TRAVIS_BRANCH, $TRAVIS_TAG)" +[ ! -z "$TRAVIS_BRANCH" ] && echo -e "# Running on Travis (TRAVIS_BRANCH: $TRAVIS_BRANCH, TRAVIS_TAG: $TRAVIS_TAGi, TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH)\n#" echo "# Project: cpp-pthread" echo "# Build date: `date`" echo "# Build directory: $cmake_build_dir" From f492b961b598905f305c946c807f2efefed4e1cd Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 16:13:03 +0200 Subject: [PATCH 8/9] refs #192 @1h We don't use varables when running rm -Rf commands... --- BUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/BUILD b/BUILD index 2f82620..3a3c1e6 100755 --- a/BUILD +++ b/BUILD @@ -4,8 +4,8 @@ # cmake_build(){ - echo "[ -d $cmake_build_dir ] && ( cd $cmake_build_dir && cmake $cmake_args .. && make $make_args )" - [ -d $cmake_build_dir ] && ( cd $cmake_build_dir && cmake $cmake_args .. && make $make_args ) + echo "cd cmake-build && cmake $cmake_args .. && make $make_args " + [ -d cmake-build ] && ( cd cmake-build && cmake $cmake_args .. && make $make_args ) } @@ -45,7 +45,6 @@ then cmake_build_type="-DCMAKE_BUILD_TYPE=Release" else cmake_build_type="-DCMAKE_BUILD_TYPE=Debug" - cmake_build_dir=cmake-build fi make_args="all test" @@ -67,11 +66,11 @@ echo "#" [ ! -z "$TRAVIS_BRANCH" ] && echo -e "# Running on Travis (TRAVIS_BRANCH: $TRAVIS_BRANCH, TRAVIS_TAG: $TRAVIS_TAGi, TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH)\n#" echo "# Project: cpp-pthread" echo "# Build date: `date`" -echo "# Build directory: $cmake_build_dir" +echo "# Build directory: cmake-build" echo "# Build options: $cmake_args" echo "# GIT current branch: [$current_branch]" echo "#" echo "##############################################################################" -[ -d $cmake_build_dir ] && (rm -Rf $cmake_build_dir/* && cmake_build ) || ( mkdir $cmake_build_dir && cmake_build ) +[ -d cmake-build ] && (rm -Rf cmake-build/* && cmake_build ) || ( mkdir cmake-build && cmake_build ) From 13d39c3dd62f50e39e591b59b0907bd03994c763 Mon Sep 17 00:00:00 2001 From: herbert koelman Date: Fri, 23 Aug 2019 16:17:34 +0200 Subject: [PATCH 9/9] fixes #192 should do the trick --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 3a3c1e6..cf647e7 100755 --- a/BUILD +++ b/BUILD @@ -63,7 +63,7 @@ cmake_args="$cmake_build_type $cmake_gcov_option $cmake_sonar_option" echo "##############################################################################" echo "#" -[ ! -z "$TRAVIS_BRANCH" ] && echo -e "# Running on Travis (TRAVIS_BRANCH: $TRAVIS_BRANCH, TRAVIS_TAG: $TRAVIS_TAGi, TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH)\n#" +[ ! -z "$TRAVIS_BRANCH" ] && echo -e "# Running on Travis (TRAVIS_BRANCH: $TRAVIS_BRANCH, TRAVIS_TAG: $TRAVIS_TAG, TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH)\n#" echo "# Project: cpp-pthread" echo "# Build date: `date`" echo "# Build directory: cmake-build"