diff --git a/release.sh b/release.sh index 35954b5bcef249cfc446abd28e46d38870f3f7fb..a8f35511a7a98faf0cafee39b68df5ab15092ae1 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,14 @@ #!/bin/bash +### Control that the script is run on `dev` branch +branch=`git rev-parse --abbrev-ref HEAD` +if [[ ! "$branch" = "dev" ]]; +then + echo ">> This script must be run under \`dev\` branch" + exit +fi + +### Releasing current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"` echo "Current version: $current" @@ -47,7 +56,10 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then ;; esac git commit -m "v$2" + git checkout master + git merge dev git tag "v$2" + git checkout dev else echo "Wrong version format" fi