Skip to content

handle travis branch issue #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 23, 2019
Merged

handle travis branch issue #103

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3330a88
refs #192
HerbertKoelman Aug 23, 2019
5bb799c
refs #192
HerbertKoelman Aug 23, 2019
3652b8b
refs #192
HerbertKoelman Aug 23, 2019
9ead0fc
refs #192
HerbertKoelman Aug 23, 2019
ae27f83
refs #192
HerbertKoelman Aug 23, 2019
1d379e6
refs #192
HerbertKoelman Aug 23, 2019
2b742dc
refs #192
HerbertKoelman Aug 23, 2019
f492b96
refs #192 @1h
HerbertKoelman Aug 23, 2019
13d39c3
fixes #192 should do the trick
HerbertKoelman Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

}

Expand All @@ -24,14 +24,27 @@ usage(){
exit 99
}

git_current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1`
set_current_branch(){
if [ -z "$TRAVIS_BRANCH" ]
then
current_branch=`git rev-parse --abbrev-ref HEAD -- | head -1`
else
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
}

set_current_branch

if [ "$git_current_branch" == "master" ]
if [ "$current_branch" == "master" ]
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"
Expand All @@ -50,13 +63,14 @@ 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_TAG, 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: [$git_current_branch]"
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 )