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

Add doc describing release branch strategy #147

Merged
merged 4 commits into from
Aug 3, 2021
Merged

Add doc describing release branch strategy #147

merged 4 commits into from
Aug 3, 2021

Conversation

dagood
Copy link
Member

@dagood dagood commented Jul 29, 2021

Adds a doc that describes the process I went through to create the 1.15/1.16 PRs (#135, #131) and a better process we can use for future (1.17+) release branches.

Rendered: https://github.com/dagood/go/tree/describe-branches/eng/doc/branches

@dagood dagood self-assigned this Jul 29, 2021
@dagood dagood marked this pull request as ready for review July 29, 2021 18:26
@dagood dagood requested a review from a team as a code owner July 29, 2021 18:26
@dagood
Copy link
Member Author

dagood commented Jul 29, 2021

@jcouv can you take a look and make sure this makes sense vs. what we talked about walking through the 1.16/1.15 branches?

@microsoft/golang-compiler PTAL, this should help give much better context for reviewing the release branch PRs:

eng/doc/branches/README.md Outdated Show resolved Hide resolved
Comment on lines +100 to +102
git rev-list golang/master..msft/microsoft/main |
while read x; do
if ! git merge-base --is-ancestor $release_base $x; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like there's got to be a way to do this with a rev-list/log expression rather than iterating and checking ourselves. I just can't quite find it. 😕

@dagood dagood mentioned this pull request Aug 2, 2021
@jcouv jcouv added the documentation Improvements or additions to documentation label Aug 2, 2021
Makes eng/doc/branches easier to browse, especially if supplemental markdown files are added.
Copy link
Member

@jcouv jcouv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM Thanks (iteration 3) with a nitpick to consider

@dagood dagood merged commit 5b2a4a4 into microsoft:microsoft/main Aug 3, 2021
@dagood dagood deleted the describe-branches branch August 3, 2021 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants