Tests fail unless master has been merged into current branch

This commit is contained in:
Rohan Mitchell
2015-04-22 13:14:51 +10:00
parent 7d4a4f8f9d
commit d406f9ccdf
2 changed files with 10 additions and 0 deletions

6
script/includes.sh Normal file
View File

@@ -0,0 +1,6 @@
function exit_unless_master_merged {
if [[ `git branch -a --merged $BUILDKITE_BRANCH` != *origin/master* ]]; then
echo "This branch does not have the current master merged. Please merge master and push again."
exit 1
fi
}