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.

Sign up for GitHub

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

Docs: release.md: miscellaneous fixes #14083

Merged
merged 2 commits into from
Feb 25, 2019
Merged

Docs: release.md: miscellaneous fixes #14083

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b2403
Docs: release.md: misc. fixes
mcsf Feb 25, 2019
2d431c0
s/onto/into
mcsf Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions docs/contributors/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This Repository is used to perform several types of releases. This document serves as a checklist for each one of these. It is helpful if you'd like to understand the different workflows.

To release Gutenberg, you need commit access to the [WordPress.org plugin repository]. 🙂
To release Gutenberg, you need commit access to the [WordPress.org plugin repository][plugin repository]. 🙂

## Plugin Releases

Expand Down Expand Up @@ -192,22 +192,23 @@ WordPress Core Updates are based on the `g-minor` branch. Releasing packages in

For major WordPress releases, the last Gutenberg plugin release is merged into `g-minor`. This involves the following steps:

1. Checkout the last published Gutenberg's release branch `git checkout release/x.x`
1. Check out the last published Gutenberg release branch `git checkout release/x.x`
2. Create a Pull Request from this branch into `g-minor`.
3. Merge the branch.

### Minor WordPress Releases

For minor releases, the critical fixes targetted for this WordPress Minor release should be cherry-picked into the `g-minor` branch one by one in their chronological order.
For minor releases, the critical fixes targeted for this WordPress Minor release should be cherry-picked onto the `g-minor` branch one by one in their chronological order.
Copy link
Member

Choose a reason for hiding this comment

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

I was not sure if onto is the right fit here.
Searching for "cherry-picked into the branch" returns 499 results and searching for "cherry-picked onto the branch" returns 8 results, so it seems into the branch is more common.
For learning purposes do you have some rule you normally follow for this case?
Thank you in advance!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for checking. I'm fine with reverting this. :)

For learning purposes do you have some rule you normally follow for this case?

I followed the case for a physical tree branch: I would sit on a branch and not in one. But that doesn't mean it would apply to Git jargon. Perhaps a native speaker could provide some perspective.

Copy link
Member

@aduth aduth Feb 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Neither really draws my attention as being more correct than the other. To me, "into" might feel more natural only in that cherry-picking feels like the act of pulling in some commit made elsewhere, regardless of whether that commit is being placed on the existing branch history.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you both. :) I will s/o/i/.


### Releasing the WordPress packages

1. Checkout the `g-minor` branch.
2. Run [the package release process](https://github.com/WordPress/gutenberg/blob/master/CONTRIBUTING.md#releasing-packages)
3. Update the `CHANGELOG` files of the published packages with the new released versions and commit to the `g-minor` branch.
1. Check out the `g-minor` branch.
2. Run the [package release process].
3. Update the `CHANGELOG.md` files of the published packages with the new released versions and commit to the `g-minor` branch.

---------

Ta-da! 🎉

[plugin repository]: https://plugins.trac.wordpress.org/browser/gutenberg/
[package release process]: https://github.com/WordPress/gutenberg/blob/master/packages/README.md#releasing-packages