From cee336547dcb07038b756ff25cc89e2fce2cbd13 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 3 May 2019 23:21:45 +0800 Subject: [PATCH] Update version script --- scripts/version.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index 6dad9c16..61f5591d 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -6,4 +6,7 @@ sed -i "0,/$CURRENT/s/$CURRENT/$NEW_VERSION/" package.json config/app.php git add package.json config/app.php git commit -m "Bump version to $NEW_VERSION" git tag -a $NEW_VERSION -m $NEW_VERSION -git push --follow-tags origin master +git checkout master +git merge dev +git push --all --follow-tags +git checkout dev