Merge branch 'master' into 4.0-pre-not-stable
This commit is contained in:
commit
131ee68aed
1 changed files with 7 additions and 1 deletions
|
@ -207,8 +207,14 @@ eof
|
||||||
# Ensure we are on the master branch
|
# Ensure we are on the master branch
|
||||||
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
|
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
|
||||||
echo "Releases are happening from the master branch, aborting"
|
echo "Releases are happening from the master branch, aborting"
|
||||||
|
|
||||||
|
echo "Enter the magic word to release anyway"
|
||||||
|
read magicword
|
||||||
|
|
||||||
|
if [ "$magicword" != "iknowwhatido" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Ensure version branch exists
|
# Ensure version branch exists
|
||||||
if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
|
if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
|
||||||
|
|
Loading…
Reference in a new issue