Merge pull request #465 from cdrage/update-release-script-resync

Update release script
This commit is contained in:
Tomas Kral 2017-03-03 17:46:26 +01:00 committed by GitHub
commit e631960894

View File

@ -71,6 +71,7 @@ clone() {
cd $CLI cd $CLI
git remote remove origin git remote remove origin
git remote add origin git@github.com:$ORIGIN_REPO/$CLI.git git remote add origin git@github.com:$ORIGIN_REPO/$CLI.git
git remote add upstream http://github.com/$UPSTREAM_REPO/$CLI
git checkout -b release-$1 git checkout -b release-$1
cd .. cd ..
} }
@ -134,6 +135,13 @@ git_pull() {
cd .. cd ..
} }
git_sync() {
cd $CLI
git fetch upstream master
git rebase upstream/master
}
push() { push() {
CHANGES=$(cat changes.txt) CHANGES=$(cat changes.txt)
# Release it! # Release it!
@ -217,6 +225,7 @@ main() {
"Generate changelog" "Generate changelog"
"Generate GitHub changelog" "Generate GitHub changelog"
"Create PR" "Create PR"
"Sync with master"
"Build binaries" "Build binaries"
"Upload the binaries and push to GitHub release page" "Upload the binaries and push to GitHub release page"
"Clean" "Clean"
@ -240,6 +249,9 @@ main() {
"Create PR") "Create PR")
git_commit $VERSION git_commit $VERSION
;; ;;
"Sync with master")
git_sync
;;
"Build binaries") "Build binaries")
build_binaries build_binaries
;; ;;