Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proposal: Switch to a master/dev branch setup #32

Closed
d4rken opened this issue Mar 25, 2015 · 2 comments
Closed

Proposal: Switch to a master/dev branch setup #32

d4rken opened this issue Mar 25, 2015 · 2 comments

Comments

@d4rken
Copy link
Member

d4rken commented Mar 25, 2015

Currently all changes and PR are merged into the master branch.
I suggest we create a dev branch.
All changes and PR are done on the dev branch.
At certain points someone says "time for a new release":

  • Merge the dev branch into master
  • Tag the last commit in master after the merge
  • Create a new release for this tag, build the jar, attach it.
  • Increase the version code+name in the sdk gradle file on the dev branch (i.e. new version in the making)

At this point the cycle starts from the beginning.

What do you think @dotsbb ?

TODO:

  • Create new branch
  • Update docs to describe this
  • Possibly update travis-ci to do it's magic on the dev branch? Not sure still inexperienced with travis
@dotsbb
Copy link
Member

dotsbb commented Mar 25, 2015

Absolutely agree. I'll handle travis.

@d4rken
Copy link
Member Author

d4rken commented Mar 25, 2015

Need me to do anything? Except send new PR via the dev branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants