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

Bump to 2.6.0 #311

Merged
merged 1 commit into from
Aug 30, 2017
Merged

Bump to 2.6.0 #311

merged 1 commit into from
Aug 30, 2017

Conversation

gabrieljoelc
Copy link
Collaborator

@gabrieljoelc gabrieljoelc commented Aug 24, 2017

See the diff between v2.5.0 and master. Looks like a minor version bump to me. Proposed changelog/release notes:

Is #279 the one that has the greatest chance of side-effects in production?

@gabrieljoelc gabrieljoelc mentioned this pull request Aug 24, 2017
@michaelklishin
Copy link
Collaborator

@gabrieljoelc the change log looks OK. A bit more detail (à la Bunny) would be better but we can worry about that after the release.

@gabrieljoelc gabrieljoelc merged commit 7e7b926 into master Aug 30, 2017
@gabrieljoelc gabrieljoelc deleted the release-2.6.0 branch August 30, 2017 20:39
@gabrieljoelc
Copy link
Collaborator Author

Pushed to rubygems.org: https://rubygems.org/gems/sneakers/versions/2.6.0.

@michaelklishin
Copy link
Collaborator

@gabrieljoelc just as we expected, #279 introduced a subtle change that can break things. I fixed one of them in #312 (too early to tell how many will run into it) and created a 2.6.x-stable branch for 2.6.1. We should probably produce a new release tomorrow.

This raises a question: in Bunny, older series branches are merged into master. Is it something you'd subscribe to? Some are big believers in cherry-picking from master but in many years maintaining Bunny I tend to first patch the oldest branch. This way you cannot forget to backport.

@gabrieljoelc
Copy link
Collaborator Author

@michaelklishin yes, that looks like the right hotfix.

I'm not sure I'm following you. When I created the 2.6.0 release branch, I had the feeling that I wished we were just doing git flow:

  • develop branch we could continually merge to
  • intentional release branches of develop that we bump the version and merge into both master and develop
    I'm not sure if that helps with what you were describing.

@gabrieljoelc
Copy link
Collaborator Author

@michaelklishin do you want me to create a hotfix release with 7e96d48 today?

@michaelklishin
Copy link
Collaborator

@gabrieljoelc in Bunny there are stable release branches (e.g. 2.6.x-stable and master). We can add develop into that but for smaller projects I'm not sure what the benefit is. But I'm not necessarily against it. Either way, it's a fundamental decision: do changes go into the oldest branch first and then merged all the way up to master, or into master first and then cherry-picked all the way to the oldest branch.

Bunny does the former. RabbitMQ currently does the former but there's an ongoing debate on our team about switching to the latter at some point. Both can work but the former makes it impossible to forget to propagate a change to all branches.

@michaelklishin
Copy link
Collaborator

@gabrieljoelc sure, feel free to release 2.6.1 when you have a moment.

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

Successfully merging this pull request may close these issues.

2 participants