You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Process for managing patch releases vs minor releases #260
Up to this point we have used master as the primary branch that all releases are derived from. Now that we have a 1.0.0 release we have the potential for two distinct release branches.
We have bug fixes that should go into a 1.0.1 release and we have 1.1 work that should be released as a 1.1.0-preview nuget.
My proposal is that we continue using master for doing gated check-in's of the latest preview. When there are bug fixes to do on an existing release, we should create a branch based on the release tag and merge patches into that branch. We should then do a patch release from that branch.
@darrelmiller
I see one problem with above suggested approach, If we create branches for Patches e.g. 1.0.1, 1.0.2 etc then for each of those branches we will need to setup CI in our internal VSO account to sign assemblies and publish nuget packages, and if anyone outside of Microsoft wants to contribute then we will have to spend cycles to do it for them right?
So I propose, we leave Master for patches work on 1.0.0 and create a new child branch from master for preview release, and as patches are released to master, we will merge master into this preview branch And when preview branch is ready for release it can be merged to Master. That way we will only need to maintain CI for Master and this new Preview branch thoughts?
I think Shweta’s method sounds cleaner to me.
If we name the preview branch with a generic string like “vNext”, we will never have to update our CI with any version update.
The part that might be a little troublesome is that we need to always merge master into this child branch, but that seems manageable.
Perth Charernwattanagul
Sent from my mobile device
On May 17, 2018, at 10:36, Shweta Patil <notifications@github.com<mailto:notifications@github.com>> wrote:
Darrel,
I see one problem with above suggested approach, If we create branches for
Patches e.g. 1.0.1, 1.0.2 etc then for each of those branches we will need
to setup CI in our internal VSO account to sign assemblies and publish
nuget packages, and if anyone outside of Microsoft wants to contribute then
we will have to spend cycles to do it for them right?
So I propose, we leave Master for patches work on 1.0.0 and create a new
child branch from master for preview release, and as patches are released
to master, we will merge master into this preview branch And when preview
branch is ready for release it can be merged to Master. That way we will
only need to maintain CI for Master and this new Preview branch thoughts?
Thanks,
~Shweta
On Thu, May 17, 2018 at 8:17 AM, Darrel ***@***.******@***.***>> wrote:
Up to this point we have used master as the primary branch that all
releases are derived from. Now that we have a 1.0.0 release we have the
potential for two distinct release branches.
We have bug fixes that should go into a 1.0.1 release and we have 1.1 work
that should be released as a 1.1.0-preview nuget.
My proposal is that we continue using master for doing gated check-in's of
the latest preview. When there are bug fixes to do on an existing release,
we should create a branch based on the release tag and merge patches into
that branch. We should then do a patch release from that branch.
Does that make sense? /cc @PerthCharern <https://github.com/PerthCharern>
@xuzhg <https://github.com/xuzhg> @Shwetap05
<https://github.com/Shwetap05>
Should we do gated check-ins to the release-v1.0.x branch? I don't know
how to set that up.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#260>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/ALrInbglVcT0IuUl3IyNNtlmBEnEXKJzks5tzZSkgaJpZM4UDRU7>
.
Activity
Shwetap05 commentedon May 17, 2018
PerthCharern commentedon May 17, 2018
darrelmiller commentedon May 17, 2018
That works for me.