Skip to content

Commit

Permalink
Merge to master
Browse files Browse the repository at this point in the history
  • Loading branch information
zengfenfei committed Aug 24, 2016
1 parent 0d23d6a commit 7c91a47
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RingCentral Client

[![Build Status](https://travis-ci.org/zengfenfei/ringcentral-js-client.svg?branch=working)](https://travis-ci.org/zengfenfei/ringcentral-js-client)
[![Build Status](https://travis-ci.org/zengfenfei/ringcentral-js-client.svg?branch=master)](https://travis-ci.org/zengfenfei/ringcentral-js-client)

This is a library implemented in typescript which provides convenient apis for typescript and javascript developers to access RingCentral webservice(https://developer.ringcentral.com/api-docs/latest/index.html).

Expand Down
7 changes: 4 additions & 3 deletions scripts/to-release-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ echo Please provide a release commit message!
exit
fi

main_branch=working
# Save the current branch
base_branch=`git rev-parse --abbrev-ref HEAD`

git checkout releases
git merge origin/$main_branch --no-edit
git merge origin/$base_branch --no-edit
npm run build
rm .gitignore
git add build
git add src
git commit -m "$1"
git checkout -- .gitignore
git push -f
git checkout $main_branch
git checkout $base_branch

0 comments on commit 7c91a47

Please sign in to comment.